Skip to content

Commit 257ca27

Browse files
LastrophysicienLastrophysicien
committed
Resolve .gitignore conflict
1 parent e5abafe commit 257ca27

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

‎.gitignore‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
__pycache__
1+
__pycache__/
22
*.pytest_cache
3-
<<<<<<< HEAD
43
.venv/
5-
6-
=======
74
.env/
8-
>>>>>>> origin/main
95
# .env
106
*.db
117
*.idea

0 commit comments

Comments
 (0)