merged

ScorpioBroker · Oct 14, 2019 · 1a895a0 · 1a895a0
1 parent a9046bf
commit 1a895a0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -38,11 +38,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-<<<<<<< HEAD
 extensions = ['sphinx_tabs.tabs']
-=======
-extensions = ['sphinx_tabs.tabs'] #, 'recommonmark']
->>>>>>> e32a9206fc824e6c2eff9ac78723746d21b4eaa6
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']