remove diff tags in conf.py

qiboteam · Nov 26, 2023 · 2786e9a · 2786e9a
1 parent 7ed8171
commit 2786e9a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -15,10 +15,7 @@
 from recommonmark.transform import AutoStructify
 
 sys.path.insert(0, os.path.abspath(".."))
-<<<<<<< HEAD
-=======
 
->>>>>>> main
 import qibochem
 
 # -- Project information -----------------------------------------------------