Merge branch 'test'

# Conflicts: # .gitattributes
updata .gitattributes
2025-12-03 15:16:27 +08:00 · 2025-12-03 11:56:55 +08:00 · 2025-12-03 11:39:59 +08:00 · 2025-12-01 16:36:19 +08:00 · 2025-12-01 15:38:08 +08:00 · 2025-12-01 14:26:14 +08:00
1 changed files with 4 additions and 4 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-vision_test/ merge=ours
-test/ merge=ours
+/vision_test/ merge=ours
+/test/ merge=ours

-.gitattributes merge=ours
-.gitignore merge=ours
+/.gitattributes merge=ours
+/.gitignore merge=ours
Author	SHA1	Message	Date
liangyuxuan	d4d235b529	Merge branch 'test' # Conflicts: # .gitattributes	2025-12-03 15:16:27 +08:00
liangyuxuan	b05bb07450	updata .gitattributes	2025-12-03 11:56:55 +08:00
liangyuxuan	17181d1847	updata .gitattributes	2025-12-03 11:39:59 +08:00
lyx	efaad72db6	updata .gitattribute	2025-12-01 16:36:19 +08:00
lyx	a98067faa5	updata .gitattribute	2025-12-01 15:38:08 +08:00
lyx	be6eab8c51	Merge pull request 'add .gitignore' (#3 ) from test into main Reviewed-on: #3	2025-12-01 14:26:14 +08:00
liangyuxuan	26d40e68ec	del test	2025-12-01 13:59:30 +08:00