Update conf.py

ptalou · Mar 11, 2018 · ee60857 · ee60857
2 parents 10cbd64 + cd04c14
commit ee60857
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/conf.py b/conf.py
@@ -35,8 +35,12 @@
 	'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']