From 734a68babd22c4085c78a14c393001117eab03ef Mon Sep 17 00:00:00 2001
From: Jean-Paul Abbuehl <jp.abbuehl@gmail.com>
Date: Sun, 19 Nov 2023 11:55:02 +0100
Subject: [PATCH] fix gitignore

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5e76f7..989e2ba 100644
--- 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)