diff options
Diffstat (limited to 'site/public/info/index.html')
| -rw-r--r-- | site/public/info/index.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/site/public/info/index.html b/site/public/info/index.html index 7d3d47e8..d1c2fb02 100644 --- a/site/public/info/index.html +++ b/site/public/info/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-"> |