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

# Conflicts: # 1.txt
4 months ago · 216b881155
parent 5d86163723 a5068d4020
commit 216b881155
1 changed files with 3 additions and 0 deletions
--- a/1.txt
+++ b/1.txt
@ -1,4 +1,7 @@
 111
+111
 222
+branch1
 333
+again
 branch2