84925+

111
1 changed files with 3 additions and 11 deletions
--- a/test.txt
+++ b/test.txt
@ -1,21 +1,13 @@
-<<<<<<< HEAD
-123  445666+6
-111
-
-
-2222
-=======
 123
 z1   z2   13131

 d11111
 d2
 d3
-<<<<<<< HEAD
->>>>>>> remotes/origin/developer
-=======
 d4w
 d5
 d6
 d7
->>>>>>> remotes/origin/main
+顶顶顶
+444444
+11111
Author	SHA1	Message	Date
HouXinyu	9274bc6f1e	84925+	9 months ago
HouXinyu	6e730f22f2	111	9 months ago