Merge branch 'main' of https://git.paco.to/nick/tfscript into main

2022-08-10 20:45:02 -04:00 · 2022-08-10 20:45:02 -04:00 · 59e42debcb
parent d967f1de17 3cf79031a8
commit 59e42debcb
2 changed files with 4 additions and 0 deletions
--- a/docs/source/_static/tfscript-logo.png
+++ b/docs/source/_static/tfscript-logo.png
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@ -25,6 +25,10 @@ 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