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

# Conflicts: # test123.txt
4 months ago · 1c0970c585
parent bde75657e6 47809d15fb
commit 1c0970c585
1 changed files with 5 additions and 1 deletions
--- a/test123.txt
+++ b/test123.txt
@ -1,3 +1,7 @@
 teste243434
-branch2 22
+<<<<<<< HEAD
 branch2 22
 =======
 branch1
 >>>>>>> 47809d15fb6d3880139f8129840abbcf1df785a1