fix?

10 files changed, 0 insertions, 40 deletions

diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html
index e1717179..28f8ccc6 100644
--- a/site/public/datasets/brainwash/index.html
+++ b/site/public/datasets/brainwash/index.html
@@ -49,11 +49,7 @@
     <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">
diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html
index c12f1522..adb81953 100644
--- a/site/public/datasets/duke_mtmc/index.html
+++ b/site/public/datasets/duke_mtmc/index.html
@@ -49,11 +49,7 @@
     <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">
diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html
index 1859e830..4f046aa7 100644
--- a/site/public/datasets/hrt_transgender/index.html
+++ b/site/public/datasets/hrt_transgender/index.html
@@ -49,11 +49,7 @@
     <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">
diff --git a/site/public/datasets/ijb_c/index.html b/site/public/datasets/ijb_c/index.html
index 511420b9..2b00e5d5 100644
--- a/site/public/datasets/ijb_c/index.html
+++ b/site/public/datasets/ijb_c/index.html
@@ -49,11 +49,7 @@
     <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">
diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html
index 4c50ceb5..a5c9c14a 100644
--- a/site/public/datasets/index.html
+++ b/site/public/datasets/index.html
@@ -49,11 +49,7 @@
     <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-">
diff --git a/site/public/datasets/msceleb/assets/notes/index.html b/site/public/datasets/msceleb/assets/notes/index.html
index 469a7bca..e9751129 100644
--- a/site/public/datasets/msceleb/assets/notes/index.html
+++ b/site/public/datasets/msceleb/assets/notes/index.html
@@ -49,11 +49,7 @@
     <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-">
diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html
index a8172dff..61c32385 100644
--- a/site/public/datasets/msceleb/index.html
+++ b/site/public/datasets/msceleb/index.html
@@ -49,11 +49,7 @@
     <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">
diff --git a/site/public/datasets/oxford_town_centre/index.html b/site/public/datasets/oxford_town_centre/index.html
index 0bf0e1be..f77b6b08 100644
--- a/site/public/datasets/oxford_town_centre/index.html
+++ b/site/public/datasets/oxford_town_centre/index.html
@@ -49,11 +49,7 @@
     <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">
diff --git a/site/public/datasets/uccs/assets/notes/index.html b/site/public/datasets/uccs/assets/notes/index.html
index e611476b..8746ed70 100644
--- a/site/public/datasets/uccs/assets/notes/index.html
+++ b/site/public/datasets/uccs/assets/notes/index.html
@@ -49,11 +49,7 @@
     <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-">
diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html
index 24544205..0ece4c6e 100644
--- a/site/public/datasets/uccs/index.html
+++ b/site/public/datasets/uccs/index.html
@@ -49,11 +49,7 @@
     <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">