summaryrefslogtreecommitdiff
path: root/site/templates
diff options
context:
space:
mode:
Diffstat (limited to 'site/templates')
-rw-r--r--site/templates/home.html2
-rw-r--r--site/templates/layout.html4
2 files changed, 5 insertions, 1 deletions
diff --git a/site/templates/home.html b/site/templates/home.html
index e09889a1..c9380b22 100644
--- a/site/templates/home.html
+++ b/site/templates/home.html
@@ -49,7 +49,7 @@
<div class='links'>
<a href="/datasets/" class='aboutLink'>DATASETS</a>
<a href="/about/" class='aboutLink'>ABOUT</a>
- <a href="/about/updates" class='updateLink'>UPDATES</a>
+ <a href="/about/news" class='updateLink'>News</a>
</div>
</header>
<div class="splash">
diff --git a/site/templates/layout.html b/site/templates/layout.html
index ccf9262c..a98eaaba 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.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-{{ metadata.cssclass }}">