HOUYT 7 years ago
parent
commit
68dcd84277
1 changed files with 6 additions and 3 deletions
  1. 6 3
      daima.txt

+ 6 - 3
daima.txt

@@ -1,8 +1,11 @@
-<<<<<<< .mine
+ 
 vbsjdkbvjk sb jk1
 =======
 =======
 jhhf jkhh kng
->>>>>>> .theirshbmn
+
+=======
+.theirshbmn
 dghf sdjk kVNKvnskdn
- gjksdjkm 
+ gjksdjkm 
+