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/datasets/msceleb | |
| parent | 11d0839a209342cb6c0d511a4ae6a5a7026c9df9 (diff) | |
| parent | 76c058b87f94fb1ed7b37869a8082c25c7ab37de (diff) | |
fix merge
Diffstat (limited to 'site/public/datasets/msceleb')
| -rw-r--r-- | site/public/datasets/msceleb/assets/notes/index.html | 4 | ||||
| -rw-r--r-- | site/public/datasets/msceleb/index.html | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/site/public/datasets/msceleb/assets/notes/index.html b/site/public/datasets/msceleb/assets/notes/index.html index e9751129..469a7bca 100644 --- a/site/public/datasets/msceleb/assets/notes/index.html +++ b/site/public/datasets/msceleb/assets/notes/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/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html index 416f19c8..a8172dff 100644 --- a/site/public/datasets/msceleb/index.html +++ b/site/public/datasets/msceleb/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-dataset"> @@ -239,7 +243,7 @@ <section> - <h3>Informaton Supply chain</h3> + <h3>Information Supply chain</h3> <p> To help understand how Microsoft Celeb has been used around the world by commercial, military, and academic organizations; existing publicly available research citing Microsoft Celebrity Dataset was collected, verified, and geocoded to show the biometric trade routes of people appearing in the images. Click on the markers to reveal research projects at that location. |