Update .gitignore and remove tracked libraries

2025-02-17 22:53:37 +01:00
parent 82d6e6cf2d
commit 2a8ffcf0dc
2 changed files with 0 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -159,7 +159,3 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
-<<<<<<< HEAD
-=======
-
->>>>>>> 638a19d39481855fcdac76f9c3ec23c860db016d
--- a/1
+++ b/1
@@ -1 +0,0 @@
-lib