Merge branch 'develop' of https://bdgit.educoder.net/p68123740/git-test into branch2

# Conflicts: # 1.txt
5 months ago · ef51896118
parent 292a9f239d e9fdcaa3a5
commit ef51896118
1 changed files with 2 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -3,4 +3,5 @@
 branch
 develop
 444
-555
+555
+666