fix gitignore

jpabbuehl · Nov 19, 2023 · 734a68b · 734a68b
1 parent be4afd2
commit 734a68b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,6 @@ Pictures/
 dev/
 nas
 .cache/
-<<<<<<< HEAD
 .python_history
 .aws
 .local
@@ -20,6 +19,3 @@ nas
 .arkade/
 .cubestore
 .docker
-=======
-.python_history
->>>>>>> 134c6c8 (reorganization)