1

2 months ago · 4fcda09414
parent 854a7ee01a
commit 4fcda09414
1 changed files with 1 additions and 4 deletions
--- a/123.txt
+++ b/123.txt
@ -1,5 +1,2 @@
-<<<<<<< HEAD
+123main
 123
 =======
 123bruch
 >>>>>>> yubingyang_branch