From 4ae2d2c817816cc731367308930be3cb62a38891 Mon Sep 17 00:00:00 2001
From: DJh2o2 <spam@woitschetzki.de>
Date: Tue, 25 Mar 2025 12:51:18 +0100
Subject: [PATCH] merge

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

diff --git a/.gitignore b/.gitignore
index 82b9526..587bd0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 # Godot 4+ specific ignores
 .godot/
 /android/
-=======
 # ---> Godot
 # Godot 4+ specific ignores
 .godot/
@@ -20,4 +18,3 @@ export_presets.cfg
 data_*/
 mono_crash.*.json
 
->>>>>>> 888d736ce7ea2debeed0ad9b786ae60a4fb59638