fixed config

2022-08-13 16:50:23 -04:00 · 2022-08-13 16:50:23 -04:00 · f6c18dda29
parent d019601298
commit f6c18dda29
1 changed files with 0 additions and 3 deletions
--- 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