处理冲突

2026-09-03 06:35:22 +08:00 · 2024-08-06 11:30:30 +08:00
parent a7711127df ec2c1dcd8a
commit 015212d602
17 changed files with 78 additions and 12 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,6 +14,7 @@
 *.ico binary
 *.jpeg binary
 *.mp3 binary
+*.mp4 binary
 *.zip binary
 *.bin binary