exmple

3 years ago · 01f56c54a3
parent cc6d052fda
commit 01f56c54a3
1 changed files with 2 additions and 1 deletions
--- a/2.txt
+++ b/2.txt
@ -4,4 +4,5 @@
 sssssssssss
 <<<<<<< HEAD
 dddddd
-mmmmmmm
+mmmmmmm
+llllllcccccyyyyyy