1 changed files with 6 additions and 1 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1 +1,6 @@
-111
+<<<<<<< HEAD
+111
+ pull-request
+=======
+111
+>>>>>>> b00145a3663772c7987d4e7a127975bf64bafc43