git-test2/1.txt

111
<<<<<<< HEAD
222
branch1
333
again
branch2
=======
branch1
again
>>>>>>> 9c72f07223f0fb6a4a688bd9a0fbec8e73ab5108
main 4 months ago			`111`
Merge branch 'main' of https://bdgit.educoder.net/p2uhpb96l/git-test2 # Conflicts: # 1.txt 4 months ago			`<<<<<<< HEAD`
main 4 months ago			`222`
			`branch1`
			`333`
			`again`
Merge branch 'main' of https://bdgit.educoder.net/p2uhpb96l/git-test2 # Conflicts: # 1.txt 4 months ago			`branch2`
			`=======`
			`branch1`
			`again`
			`>>>>>>> 9c72f07223f0fb6a4a688bd9a0fbec8e73ab5108`