Fix conf.py during merge conflict

chudur-budur · Diptorup Deb · commit 346c02bbf239 · 2023-07-20T21:19:30.000-05:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -52,10 +52,7 @@
     "sphinx.ext.autosectionlabel",
     "sphinxcontrib.programoutput",
     "sphinxcontrib.googleanalytics",
-<<<<<<< HEAD:docs/source/conf.py
     "myst_parser",
-=======
->>>>>>> Restructured the overview section and other minor fixes.:docs/sources/conf.py
 ]
 
 # Add any paths that contain templates here, relative to this directory.
