From 8bbaeaca42f3a4bcec6fd84771e9ab1a4ac1cea2 Mon Sep 17 00:00:00 2001
From: kn0wmad <kn0wmad@protonmail.com>
Date: Thu, 21 Oct 2021 14:34:22 -0600
Subject: [PATCH] ?

---
 source/conf.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/source/conf.py b/source/conf.py
index 4953ba5..ce0946a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,13 +35,10 @@ templates_path = ['_templates']
 
 # HTML sidebar widgets
 # html_sidebars = {
-<<<<<<< HEAD
 #     "**": ["versioning.html"],
-=======
 #     '**': [
 #         'versioning.html',
 #     ],
->>>>>>> c566da4 (Versioning init)
 # }
 
 # List of patterns, relative to source directory, that match files and
@@ -50,7 +47,6 @@ templates_path = ['_templates']
 exclude_patterns = []
 
 # Multiversion settings
-<<<<<<< HEAD
 # smv_tag_whitelist = None
 # smv_branch_whitelist = None
 # smv_prefer_remote_refs = True
@@ -59,12 +55,10 @@ exclude_patterns = []
 #     "v0.2.x" : "https://github.com/Start9Labs/documentation",
 #     "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates"
 # }
-=======
 smv_tag_whitelist = 'None'
 smv_prefer_remote_refs = True
 # smv_branch_whitelist = master
 
->>>>>>> c566da4 (Versioning init)
 
 # -- Options for HTML output -------------------------------------------------