From fe2883857359850d913ee0e0cfac5c5c4e9fa650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrb=C3=A1=C4=8D?= <david@hrbac.cz>
Date: Thu, 12 Jan 2017 16:50:53 +0100
Subject: [PATCH] correction to mkdocs.yml
---
mkdocs.yml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/mkdocs.yml b/mkdocs.yml
index d12c69d6a..f0333d99c 100644
--- 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'
--
GitLab