Merge branch 'dev' of https://bdgit.educoder.net/pzo9jb4e6/gitProject into dev

# Conflicts: # doc/1111.txt
3 years ago · 248a779700
parent fe7c7b9229 afed73e99a
commit 248a779700
2 changed files with 3 additions and 2 deletions
--- a/123.txt
+++ b/123.txt
@ -1 +0,0 @@
-123
--- a/doc/1111.txt
+++ b/doc/1111.txt
@ -1,3 +1,5 @@
 1111
+22
+5555
 3333
-4444
+4444