Resolve merge conflicts

2021-09-16 22:58:54 -05:00
parent 10731696df 8dc1e9bfa4
commit 04a5db5c1d
753 changed files with 106429 additions and 94299 deletions
@@ -6,6 +6,7 @@ __pycache__/

 # Distribution / packaging
 .Python
+.python-version
 env/
 venv/
 eggs/
@@ -31,4 +32,4 @@ cps/cache
 settings.yaml
 gdrive_credentials
 client_secrets.json
-
+gmail.json