Merge branch 'dev' of https://bdgit.educoder.net/pqfwskzrl/hhj_gitTask into a_branch

# Conflicts: # test1.txt
3 years ago · 787a3f8a43
parent 89dc4a7a5c 8347436fe1
commit 787a3f8a43
1 changed files with 1 additions and 0 deletions
--- a/test1.txt
+++ b/test1.txt
@ -1,3 +1,4 @@
 111
 333a_branch
+222dev
 444