summaryrefslogtreecommitdiff
path: root/site/public/about/attribution
diff options
context:
space:
mode:
Diffstat (limited to 'site/public/about/attribution')
-rw-r--r--site/public/about/attribution/index.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/site/public/about/attribution/index.html b/site/public/about/attribution/index.html
index fc3f7a8f..5c3a4ec4 100644
--- a/site/public/about/attribution/index.html
+++ b/site/public/about/attribution/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-about">