Remove conflict marker in file

imikejackson · imikejackson · commit f42a50c11e2d · 2017-10-21T09:07:58.000-04:00
diff --git a/Documentation/mkdocs.yml b/Documentation/mkdocs.yml
@@ -30,4 +30,3 @@ markdown_extensions:
   - admonition
   - codehilite(guess_lang=false)
   - toc(permalink=true)
->>>>>>> Use the windmill theme for mkdocs
