diff options
Diffstat (limited to 'site/public/test')
| -rw-r--r-- | site/public/test/chart/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/citations/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/csv/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/datasets/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/face_search/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/gallery/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/map/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/name_search/index.html | 4 | ||||
| -rw-r--r-- | site/public/test/pie_chart/index.html | 4 |
10 files changed, 40 insertions, 0 deletions
diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html index 87067a28..1c8af1a5 100644 --- a/site/public/test/chart/index.html +++ b/site/public/test/chart/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-"> diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html index 685395f0..d14475d6 100644 --- a/site/public/test/citations/index.html +++ b/site/public/test/citations/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-"> diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html index 9fbda1c6..c4927b4e 100644 --- a/site/public/test/csv/index.html +++ b/site/public/test/csv/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-"> diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html index 2270349f..43f84766 100644 --- a/site/public/test/datasets/index.html +++ b/site/public/test/datasets/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-"> diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html index 15a6899d..b756dd67 100644 --- a/site/public/test/face_search/index.html +++ b/site/public/test/face_search/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-"> diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html index 6746fe6a..c3efa57e 100644 --- a/site/public/test/gallery/index.html +++ b/site/public/test/gallery/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-"> diff --git a/site/public/test/index.html b/site/public/test/index.html index a0989be1..26d48053 100644 --- a/site/public/test/index.html +++ b/site/public/test/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-"> diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html index 9229abc5..6d786724 100644 --- a/site/public/test/map/index.html +++ b/site/public/test/map/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-"> diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html index d900e565..ecf003d0 100644 --- a/site/public/test/name_search/index.html +++ b/site/public/test/name_search/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-"> diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html index 72dc0290..14d7c179 100644 --- a/site/public/test/pie_chart/index.html +++ b/site/public/test/pie_chart/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-"> |
