Merge clash corrections

Browse Source

...

This commit is contained in:

Teddy-1024

2024-05-01 21:19:27 +01:00

parent ae2010aeec d9b41534c5

commit 3dbdd8715a

6 changed files with 25 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

__pycache__/app.cpython-311.pyc

Binary file not shown.

BIN

__pycache__/app2.cpython-311.pyc

Binary file not shown.

BIN

__pycache__/config.cpython-311.pyc

Binary file not shown.