From b3ed0f95eb94a4e7cb5e137bb8196db8c36aa50d Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam@ahprojects.com>
Date: Wed, 5 Jun 2019 10:44:12 -0500
Subject: fix?

---
 site/public/research/00_introduction/index.html           | 4 ----
 site/public/research/01_from_1_to_100_pixels/index.html   | 4 ----
 site/public/research/02_what_computers_can_see/index.html | 4 ----
 site/public/research/index.html                           | 4 ----
 4 files changed, 16 deletions(-)

(limited to 'site/public/research')

diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html
index e736f056..e056bc62 100644
--- a/site/public/research/00_introduction/index.html
+++ b/site/public/research/00_introduction/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/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html
index 09503074..90efd707 100644
--- a/site/public/research/01_from_1_to_100_pixels/index.html
+++ b/site/public/research/01_from_1_to_100_pixels/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/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html
index 7c07c72b..f8a36624 100644
--- a/site/public/research/02_what_computers_can_see/index.html
+++ b/site/public/research/02_what_computers_can_see/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/research/index.html b/site/public/research/index.html
index c64a1096..569857c5 100644
--- a/site/public/research/index.html
+++ b/site/public/research/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-">
-- 
cgit v1.2.3-70-g09d2