From f6c18dda290b7f314d66be3cb8a05b8ba7555aca Mon Sep 17 00:00:00 2001
From: Paco Hope <github@filter.paco.to>
Date: Sat, 13 Aug 2022 16:50:23 -0400
Subject: [PATCH] fixed config

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

diff --git a/docs/source/conf.py b/docs/source/conf.py
index fd9570e..285725a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,10 +25,7 @@ html_theme_options = {
     'description'      : "Managing and simplifying TF2 scripts.",
     'fixed_sidebar'    : True,
     'show_powered_by'  : False,
-<<<<<<< Updated upstream
-=======
     'logo'             : 'tfscript-logo.png',
->>>>>>> Stashed changes
 }
 
 import os