-

2023-04-07 08:57:30 +02:00
parent 6b20a596c1
commit a2284c929f
1 changed files with 5 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 /__pycache__
 /venv
 /configs/squash
+=======
+/venv
+/__pycache__
+>>>>>>> 7ca4d57 (-)