Merge branch 'main' of https://bdgit.educoder.net/p2uhpb96l/git-test2

# Conflicts: # 1.txt
main
1 changed files with 9 additions and 1 deletions
--- a/1.txt
+++ b/1.txt
@ -1,3 +1,11 @@
 111
+<<<<<<< HEAD
+222
 branch1
+333
 again
+branch2
+=======
+branch1
+again
+>>>>>>> 9c72f07223f0fb6a4a688bd9a0fbec8e73ab5108
Author	SHA1	Message	Date
hftian	2488fe6389	Merge branch 'main' of https://bdgit.educoder.net/p2uhpb96l/git-test2 # Conflicts: # 1.txt	7 months ago
hftian	e43c243e4d	main	7 months ago
p2uhpb96l	9c72f07223	br br	7 months ago
hftian	6b9c6dd892	br2	7 months ago
hftian	f14c283296	main	7 months ago
hftian	216b881155	Merge branch 'main' of https://bdgit.educoder.net/p2uhpb96l/git-test2 into branch2 # Conflicts: # 1.txt	7 months ago
hftian	5d86163723	branch2	7 months ago