diff options
| author | Adam Harvey <adam@ahprojects.com> | 2019-06-05 10:44:12 -0500 |
|---|---|---|
| committer | Adam Harvey <adam@ahprojects.com> | 2019-06-05 10:44:12 -0500 |
| commit | b3ed0f95eb94a4e7cb5e137bb8196db8c36aa50d (patch) | |
| tree | 8eb5ce503f805bbd58c4565cd845ac196b1a30dd /site/public/datasets/uccs | |
| parent | 7919ecc1a760f611efbe1283096482a8ec99efef (diff) | |
fix?
Diffstat (limited to 'site/public/datasets/uccs')
| -rw-r--r-- | site/public/datasets/uccs/assets/notes/index.html | 4 | ||||
| -rw-r--r-- | site/public/datasets/uccs/index.html | 4 |
2 files changed, 0 insertions, 8 deletions
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"> |