e3e3e

4 months ago · 3e8d6e5617
parent 1c0970c585
commit 3e8d6e5617
1 changed files with 0 additions and 4 deletions
--- a/test123.txt
+++ b/test123.txt
@ -1,7 +1,3 @@
 teste243434

-<<<<<<< HEAD
 branch2 22
-=======
-branch1
->>>>>>> 47809d15fb6d3880139f8129840abbcf1df785a1