Update conf.py

sunpy · Oct 30, 2024 · f09fe60 · f09fe60
1 parent abc886f
commit f09fe60
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -80,13 +80,10 @@
     "pfsspy": ("https://pfsspy.readthedocs.io/en/latest/", None),
 }
 
-<<<<<<<
 # -- Options for HTML output -------------------------------------------------
 
-=======
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
->>>>>>>
 html_theme = "sunpy"
 
 # Render inheritance diagrams in SVG