Merge remote and resolve .gitignore conflict
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
commit
eb34dbffe0
1 changed files with 4 additions and 1 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -2,5 +2,8 @@ venv/
|
|||
uploads/
|
||||
output/
|
||||
__pycache__/
|
||||
*.pyc
|
||||
*.py[cod]
|
||||
.DS_Store
|
||||
node_modules/
|
||||
.idea/
|
||||
Thumbs.db
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue