From a7c5beeb7deec5d86cc500554feab05f00da96aa Mon Sep 17 00:00:00 2001
From: Charlotte Doussot <cha.doussot@gmail.com>
Date: Mon, 29 Jan 2018 15:24:22 +0100
Subject: [PATCH] config update githubpages problem on zindows
---
doc/source/conf.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a8c6dd9..bbb7a3e 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -41,12 +41,7 @@ extensions = ['matplotlib.sphinxext.only_directives',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
-<<<<<<< HEAD
'sphinx.ext.viewcode']
-=======
- 'sphinx.ext.viewcode',
- 'sphinx.ext.graphviz']
->>>>>>> 73c7bc85414d44623136d742f4718180b1852277
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
--
GitLab