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/datasets/uccs/assets/notes/index.html | 4 ----
 site/public/datasets/uccs/index.html              | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'site/public/datasets/uccs')

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">
-- 
cgit v1.2.3-70-g09d2