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

# Conflicts: # test123.txt
sss
1 changed files with 8 additions and 1 deletions
--- a/test123.txt
+++ b/test123.txt
@ -1,3 +1,10 @@
 teste243434
-branch1
+branch1
 develop
 nnnnnn
 ssssss
Author	SHA1	Message	Date
lc	abd48ba193	Merge branch 'develop' of https://bdgit.educoder.net/pztlwna8v/git--test1 into branch2 # Conflicts: # test123.txt	4 months ago
lc	5627506d9c	sss	4 months ago
lc	0db1e42ade	Merge branch 'develop' of https://bdgit.educoder.net/pztlwna8v/git--test1 into branch2 # Conflicts: # test123.txt	4 months ago
lc	d4b5cd1bc1	nnn	4 months ago
lc	11301b82c1	Merge branch 'develop' of https://bdgit.educoder.net/pztlwna8v/git--test1 into branch2 # Conflicts: # test123.txt	4 months ago
lc	1b52ec5129	444	4 months ago
lc	38b4aaf8a3	develop	4 months ago
lc	04f4c68556	3333	4 months ago
lc	3e8d6e5617	e3e3e	4 months ago
lc	1c0970c585	Merge branch 'main' of https://bdgit.educoder.net/pztlwna8v/git--test1 into branch2 # Conflicts: # test123.txt	4 months ago
lc	bde75657e6	2	4 months ago
lc	1b60b18703	222222	4 months ago