tian1

1 year ago · 78ecc7632f
parent fd9b1dd858
commit 78ecc7632f
1 changed files with 1 additions and 5 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1,7 +1,3 @@
-<<<<<<< HEAD
 111
 222
-=======
-222
-333
->>>>>>> main
+