Fixed conf.py

ptalou · Mar 11, 2018 · 6ffb7d4 · 6ffb7d4
1 parent ee60857
commit 6ffb7d4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/conf.py b/conf.py
@@ -35,12 +35,8 @@
 	'nbsphinx',
 	'sphinx.ext.todo',
 	'sphinx.ext.autodoc',
-<<<<<<< HEAD
 	'sphinx.ext.mathjax',
 	'IPython.sphinxext.ipython_console_highlighting']
-=======
-	'sphinx.ext.mathjax']
->>>>>>> cd04c1470958ca1c2f68b59daba529df4fefddc0
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']