summaryrefslogtreecommitdiff
path: root/site/public/datasets/ijb_c/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'site/public/datasets/ijb_c/index.html')
-rw-r--r--site/public/datasets/ijb_c/index.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/site/public/datasets/ijb_c/index.html b/site/public/datasets/ijb_c/index.html
index ec0f716e..511420b9 100644
--- a/site/public/datasets/ijb_c/index.html
+++ b/site/public/datasets/ijb_c/index.html
@@ -49,7 +49,11 @@
<div class='links'>
<a href="/datasets/">Datasets</a>
<a href="/about/">About</a>
+<<<<<<< HEAD
+ <a href="/about/news">News</a>
+=======
<a href="/about/updates/">Updates</a>
+>>>>>>> 76c058b87f94fb1ed7b37869a8082c25c7ab37de
</div>
</header>
<div class="content content-dataset">