mod

3 years ago · a8e87c9500
parent 50ad13da89
commit a8e87c9500
1 changed files with 0 additions and 3 deletions
--- a/doc/1111.txt
+++ b/doc/1111.txt
@ -1,8 +1,5 @@
 1111
-<<<<<<< HEAD
 22
 5555
-=======
 3333
 4444
->>>>>>> 6ff2c6487638411e964f63aefe8be6c2c40a0946