Merge branch 'main' of https://bdgit.educoder.net/pybwukaot/git-418

# Conflicts: # test.txt
10 months ago · c452a5c929
parent 051cd613cd f158245906
commit c452a5c929
1 changed files with 4 additions and 0 deletions
--- a/test.txt
+++ b/test.txt
@ -1,2 +1,6 @@
 branch-z
 branch-b
+<<<<<<< HEAD
+=======
+pull request
+>>>>>>> f15824590696f6f275016003618589b8602255d4