FIXED THE MERGE CONFLICT (THANKS)
This commit is contained in:
parent
e1df8869fb
commit
af1353a41a
5 changed files with 91 additions and 27 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -1,4 +1,5 @@
|
|||
venv/
|
||||
__pycache__
|
||||
__pycache__/
|
||||
.idea/
|
||||
.vscode/
|
||||
token.txt
|
||||
|
|
Reference in a new issue