correction to mkdocs.yml

fe288385 · David Hrbáč · 24c803ed · fe288385
Commit fe288385 authored Jan 12, 2017 by David Hrbáč
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -190,13 +190,8 @@ pages:
 extra:
  logo: img/logo2.png
  palette:
-<<<<<<< HEAD
    primary: 'blue grey'
    accent: 'light blue'
-=======
-    primary: 'blue grey'
-    accent: 'red'
->>>>>>> Setting color to: red
  font:
    text: 'Roboto'
    code: 'Roboto Mono'