Merge branch 'main' of https://bdgit.educoder.net/p29304815/gittest into branch2

# Conflicts: # 1.txt
8 months ago · 361c47cf78
parent 7eb2726550
commit 361c47cf78
1 changed files with 2 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,3 @@
 111
-branch2
+branch1
+branch2