From a6a7182950529427dfb98b405f4fc8b3af3b7b17 Mon Sep 17 00:00:00 2001
From: kn0wmad <kn0wmad@protonmail.com>
Date: Tue, 14 Sep 2021 17:04:13 -0600
Subject: [PATCH] Versioning init

---
 source/conf.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/source/conf.py b/source/conf.py
index af7305f..4953ba5 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,7 +35,13 @@ 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
@@ -44,6 +50,7 @@ templates_path = ['_templates']
 exclude_patterns = []
 
 # Multiversion settings
+<<<<<<< HEAD
 # smv_tag_whitelist = None
 # smv_branch_whitelist = None
 # smv_prefer_remote_refs = True
@@ -52,6 +59,12 @@ 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 -------------------------------------------------