Update .gitignore

Signed-off-by: Paul Schweigert <[email protected]>
i-am-bee · Jan 30, 2025 · fef9b4e · fef9b4e
1 parent 7fb7dbe
commit fef9b4e
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -172,9 +172,3 @@ cython_debug/
 
 # VScode
 .vscode/
-<<<<<<< HEAD
-=======
-
-# Do not commit poetry lock file
-poetry.lock
->>>>>>> main