chore: resolve .gitignore conflict, keep both upstream and local entries

This commit is contained in:
wauxing 2026-07-07 10:50:26 +08:00
parent 3e389d8368
commit 1b54a4ebf1
1 changed files with 3 additions and 2 deletions

5
.gitignore vendored
View File

@ -1,6 +1,7 @@
docs/
doc/
# Pythondemo 网页后端)
# Python & demo artifacts
__pycache__/
*.pyc
demo/bin/
demo/bin/
data/