updated .gitignore

lshpaner · Dec 27, 2024 · a0b1fc7 · a0b1fc7
1 parent 0213bab
commit a0b1fc7
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,27 +7,14 @@ __pycache__/
 *.github/
 **/*venv*/
 edatkit_374/
-<<<<<<< HEAD
 src/*.doctree
 *.pickle
-.doctrees
-.doctrees
-.doctrees
-.doctrees
-.doctrees
 .doctrees/
-*.buildinfo
-docs/**/*.doctrees
-docs/**/*.buildinfo
-docs/**/*.doctrees
-docs/**/*.buildinfo
 docs/**/*.doctrees
+docs/**/*.doctree
 docs/**/*.buildinfo
-=======
 src/
 # Ignore autogenerated files
 *.doctree
 *.buildinfo
 *.pickle
->>>>>>> new-branch-name
-docs/**/*.doctree