Merge branch 'main' of https://bdgit.educoder.net/pj4fbin3h/git-test

# Conflicts: # 1.txt
2 years ago · 1dd3dbadbb
parent d17a1bbd22 018c7cd44c
commit 1dd3dbadbb
1 changed files with 5 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,2 +1,6 @@
 <<<<<<< HEAD
 111
-branc1
+branc1
 =======
 111
 >>>>>>> 018c7cd44cba6d6b00221a17621febf027b46c75