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

# Conflicts: # test123.txt
4 months ago · abd48ba193
parent 0db1e42ade 5627506d9c
commit abd48ba193
1 changed files with 8 additions and 3 deletions
--- a/test123.txt
+++ b/test123.txt
@ -1,5 +1,10 @@
 teste243434

-branch2 22333
-branch2
-444
+branch1
+
+develop
+
+
+nnnnnn
+
+ssssss