Merge remote .gitignore and resolve conflict

2026-03-18 23:59:12 +01:00
parent cb1e217bbe ad36d1ba7c
commit 10cf482d9f
2 changed files with 43 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,8 @@ server/uploads/

 # Environment
 .env
-.env.local
-.env.production
+.env.*
+!.env.example

 # OS files
 .DS_Store
@@ -27,5 +27,25 @@ Thumbs.db
 .idea/

 # Logs
+logs
 *.log
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+*.pid
+*.seed
+*.pid.lock
+
+# Coverage
+coverage
+*.lcov
+.nyc_output
+
+# Cache
+.npm
+.eslintcache
+.cache
+*.tsbuildinfo
+*.tgz