chore: resolving merge conflict in gitignore

Algorithmology · Apr 29, 2024 · 110e51d · 110e51d
1 parent 4e88c3f
commit 110e51d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,3 @@
 .devenv/
-<<<<<<< HEAD
-__pycache__/
-.venv/
-=======
 .venv/
 __pycache__/
->>>>>>> main