Fixed build errors

tests/visual/suites/extensions/admonition/docs/index.md

@@ -1,20 +1,15 @@
-<<<<<<< HEAD
 # Suite
 
 For this test, the header is set to `display: none`, as Gemini aligns the
 elements to be captured with the top of the page, thus getting blocked by the
 fixed positioned header.
 
-=======
->>>>>>> master
 <style>
   .md-header {
     display: none;
   }
 </style>
 
-# Suite
-
 ## Default
 
 !!! note

tests/visual/suites/extensions/admonition/mkdocs.yml

@@ -19,15 +19,11 @@
 # IN THE SOFTWARE.
 
 # Test suite
-<<<<<<< HEAD
 site_name: Test
 pages:
   - Lorem ipsum dolor sit amet: index.md
 
 # Extensions
-=======
-site_name: Test/Admonition
->>>>>>> master
 markdown_extensions:
   - markdown.extensions.admonition
 

tests/visual/suites/layout/nav/_overflow/docs/index.md

@@ -1,11 +1,8 @@
-<<<<<<< HEAD
 # Suite
 
 All transitions are set to `none` in order to ensure that all elements of
 interest always look the same and are not captured somewhere in the middle.
 
-=======
->>>>>>> master
 <style>
   *,
   *::before,
@@ -13,5 +10,3 @@ interest always look the same and are not captured somewhere in the middle.
     transition: none !important;
   }
 </style>
-
-# Suite

tests/visual/suites/layout/nav/_overflow/docs/nested.md

@@ -1,11 +1,8 @@
-<<<<<<< HEAD
 # Suite
 
 All transitions are set to `none` in order to ensure that all elements of
 interest always look the same and are not captured somewhere in the middle.
 
-=======
->>>>>>> master
 <style>
   *,
   *::before,
@@ -13,8 +10,3 @@ interest always look the same and are not captured somewhere in the middle.
     transition: none !important;
   }
 </style>
-<<<<<<< HEAD
-=======
-
-# Suite
->>>>>>> master

tests/visual/suites/layout/nav/_overflow/mkdocs.yml

@@ -24,13 +24,8 @@ pages:
   - Pneumonoultramicroscopicsilicovolcanoconiosis: index.md
   - Supercalifragilisticexpialidocious:
     - Pseudopseudohypoparathyroidism: nested.md
-<<<<<<< HEAD
     - Floccinaucinihilipilification: _.md
     - Antidisestablishmentarianism: _.md
-=======
-    - Floccinaucinihilipilification: nested.md
-    - Antidisestablishmentarianism: nested.md
->>>>>>> master
 
 # Reset webfonts because of flaky tests
 extra:

tests/visual/suites/layout/nav/docs/default.md

@@ -1,9 +0,0 @@
-<style>
-  *,
-  *::before,
-  *::after {
-    transition: none !important;
-  }
-</style>
-
-# Suite

tests/visual/suites/layout/nav/docs/index.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Suite
 
 All transitions are set to `none` in order to ensure that all elements of
@@ -8,28 +7,15 @@ Furthermore, the table of contents is hidden for all tests layed out on this
 page, as it is sometimes shown within the drawer though it isn't activated.
 This seems to be a caching-related issue.
 
-=======
->>>>>>> master
 <style>
   *,
   *::before,
   *::after {
     transition: none !important;
   }
-<<<<<<< HEAD
-=======
-
-  /* Hack: ensure table of contents is hidden, as browser caching sometimes
-     makes it visible by accident, though it was never activated */
->>>>>>> master
   .md-nav--secondary {
     display: none !important;
   }
 </style>
 
-<<<<<<< HEAD
-=======
-# Suite
-
->>>>>>> master
 ## Default

tests/visual/suites/layout/nav/docs/nested.md

@@ -1,3 +1,8 @@
+# Suite
+
+All transitions are set to `none` in order to ensure that all elements of
+interest always look the same and are not captured somewhere in the middle.
+
 <style>
   *,
   *::before,
@@ -5,5 +10,3 @@
     transition: none !important;
   }
 </style>
-
-# Suite

tests/visual/suites/layout/nav/mkdocs.yml

@@ -26,15 +26,9 @@ pages:
   - Etiam condimentum lacinia urna id vestibulum: _.md
   - A dapibus turpis iaculis at:
     - Donec tortor sem: nested.md
-<<<<<<< HEAD
     - Scelerisque ut congue id: secondary.md
     - Pretium ac risus: _.md
   - Maecenas tincidunt nulla dui: _.md
-=======
-    - Scelerisque ut congue id: nested.md
-    - Pretium ac risus: nested.md
-  - Maecenas tincidunt nulla dui: default.md
->>>>>>> master
 
 # Reset webfonts because of flaky tests
 extra: