Merge branch and resolve .gitignore conflict

DavidKRK · DavidKRK · commit ea52674604cd · 2025-05-14T09:18:46.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-.aider*
-=======
 # Dependencies
 node_modules/
 package-lock.json
@@ -19,5 +16,4 @@ Thumbs.db
 
 # Environment
 .env
-.env.local 
->>>>>>> 0493f4993fce6719914b5aacb418e45a7baaddf2
+.env.local
