From 1d8d70c54bdfe89cbb84176d59244e1344b1a931 Mon Sep 17 00:00:00 2001
From: fr4nz <fr4nz@mailbox.org>
Date: Sat, 10 Jan 2026 14:45:32 +0100
Subject: [PATCH] Update .gitignore

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

diff --git a/.gitignore b/.gitignore
index b76377e..81e676c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 test.sh
-<<<<<<< HEAD
 devdoc.md
-=======
->>>>>>> main
 binaries
\ No newline at end of file