diff options
| author | Adam Harvey <adam@ahprojects.com> | 2019-06-05 09:51:26 -0500 |
|---|---|---|
| committer | Adam Harvey <adam@ahprojects.com> | 2019-06-05 09:51:26 -0500 |
| commit | 7919ecc1a760f611efbe1283096482a8ec99efef (patch) | |
| tree | 80c3d320926a218aaefe28dbc4043d64f54e6e7d /site/public/research/01_from_1_to_100_pixels | |
| parent | 11d0839a209342cb6c0d511a4ae6a5a7026c9df9 (diff) | |
| parent | 76c058b87f94fb1ed7b37869a8082c25c7ab37de (diff) | |
fix merge
Diffstat (limited to 'site/public/research/01_from_1_to_100_pixels')
| -rw-r--r-- | site/public/research/01_from_1_to_100_pixels/index.html | 4 |
1 files changed, 4 insertions, 0 deletions
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 90efd707..09503074 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,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-"> |