处理冲突

This commit is contained in:
liuminhui 2024-08-06 11:30:30 +08:00
commit 015212d602
17 changed files with 78 additions and 12 deletions

1
.gitattributes vendored
View file

@ -14,6 +14,7 @@
*.ico binary
*.jpeg binary
*.mp3 binary
*.mp4 binary
*.zip binary
*.bin binary