Fixing conf.py

hoff-diesel · Jun 30, 2021 · b9983c5 · b9983c5
1 parent 071815b
commit b9983c5
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -12,11 +12,7 @@
 #
 import os
 import sys
-<<<<<<< HEAD
-sys.path.insert(0, os.path.abspath('..'))
-=======
 sys.path.insert(0, os.path.abspath('../simantha'))
->>>>>>> dev
 
 
 # -- Project information -----------------------------------------------------
@@ -25,11 +21,7 @@
 copyright = '2021, Michael Hoffman'
 author = 'Michael Hoffman'
 
-<<<<<<< HEAD
-release = '0.0.1'
-=======
 release = '0.1.0'
->>>>>>> dev
 
 
 # -- General configuration ---------------------------------------------------
@@ -59,9 +51,6 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
-<<<<<<< HEAD
-=======
 
 
 autodoc_member_order = 'bysource'
->>>>>>> dev