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