diff options
Diffstat (limited to 'site/public/research')
4 files changed, 16 insertions, 0 deletions
diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html index 9615a9a1..e736f056 100644 --- a/site/public/research/00_introduction/index.html +++ b/site/public/research/00_introduction/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/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html index dc262a58..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-"> diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html index 72ee5006..7c07c72b 100644 --- a/site/public/research/02_what_computers_can_see/index.html +++ b/site/public/research/02_what_computers_can_see/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/research/index.html b/site/public/research/index.html index 97af5f77..c64a1096 100644 --- a/site/public/research/index.html +++ b/site/public/research/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-"> |