Merge branch 'main' of https://bdgit.educoder.net/p2uhpb96l/git-test2

# Conflicts: # 1.txt
6 months ago · 2488fe6389
parent e43c243e4d 9c72f07223
commit 2488fe6389
1 changed files with 6 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,6 +1,11 @@
 111
+<<<<<<< HEAD
 222
 branch1
 333
 again
-branch2
+branch2
+=======
+branch1
+again
+>>>>>>> 9c72f07223f0fb6a4a688bd9a0fbec8e73ab5108