Merge conflict resolved in .gitignore

2025-10-03 19:57:58 +02:00
parent d9d73eee41 f568875b2c
commit 67390a76f3
20 changed files with 4263 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,25 @@
-/.idea/
+# IDE
+.idea/
+.vscode/
+
+# Dependencies
+vendor/
+node_modules/
+
+# Environment
+.env
+.env.local
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Logs
+*.log
+
+# Temporary files
+*.tmp
+*.cache
+
+# Docker
+docker-compose.override.yml