Resolve merge conflict in .gitignore

This commit is contained in:
2025-12-27 17:13:52 +11:00
12 changed files with 7087 additions and 618 deletions

4
.gitignore vendored
View File

@@ -1,5 +1,9 @@
node_modules
dist
.DS_Store
*.log
.env
deploy-secrets.json
config/secrets.env
scripts/auth.json
*.zip