Solving merge conflicts

This commit is contained in:
Carlos-Mesquita
2024-11-06 00:11:19 +00:00
20 changed files with 1321 additions and 177 deletions

12
.gitignore vendored
View File

@@ -1,6 +1,6 @@
__pycache__
.idea
.env
.DS_Store
.venv
_scripts
__pycache__
.idea
.env
.DS_Store
.venv
_scripts