From db231f91724a83ab1ff038f5266da0e27296aeb8 Mon Sep 17 00:00:00 2001
From: Max <mbrand7@wbsedu.de>
Date: Mon, 10 Aug 2026 15:30:13 +0200
Subject: [PATCH] .aaa

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 826a6d7..ac343bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 **/bin/
 **/*.kdev4
+=======
+**/.git/
+>>>>>>> 04d78ae (.)