Spaces:
Sleeping
Sleeping
Commit
·
86ef758
1
Parent(s):
1174f8a
Fix .gitignore and resolve conflicts
Browse files- .gitignore +0 -8
- README.md +0 -0
.gitignore
CHANGED
|
@@ -1,13 +1,5 @@
|
|
| 1 |
-
<<<<<<< HEAD
|
| 2 |
-
<<<<<<< HEAD
|
| 3 |
.env.*
|
| 4 |
.venv/
|
| 5 |
__pycache__/
|
| 6 |
*.pyc
|
| 7 |
.DS_Store
|
| 8 |
-
=======
|
| 9 |
-
.env.*
|
| 10 |
-
>>>>>>> 66c1ee8c459604895e42be1a97a63f258b3cfabe
|
| 11 |
-
=======
|
| 12 |
-
.env.*
|
| 13 |
-
>>>>>>> 66c1ee8c459604895e42be1a97a63f258b3cfabe
|
|
|
|
|
|
|
|
|
|
| 1 |
.env.*
|
| 2 |
.venv/
|
| 3 |
__pycache__/
|
| 4 |
*.pyc
|
| 5 |
.DS_Store
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
README.md
ADDED
|
File without changes
|