Merge branch 'main' of https://bdgit.educoder.net/pw3s5tnx7/git-test into branch1

# Conflicts: # 1.txt.txt
111
2 changed files with 6 additions and 2 deletions
--- a/1.txt
+++ b/1.txt
@ -1 +1 @@
-111
+111
--- a/1.txt.txt
+++ b/1.txt.txt
@ -1,2 +1,6 @@
 111
-branch1
+branch1
 <<<<<<< HEAD
 =======
 branch2
 >>>>>>> ce673b182f289e0052f64a841780e0578b0e1ace
Author	SHA1	Message	Date
lin	801d7ae6a1	Merge branch 'main' of https://bdgit.educoder.net/pw3s5tnx7/git-test into branch1 # Conflicts: # 1.txt.txt	11 months ago
lin	1c88c3ad35	111	11 months ago
lin	ce673b182f	branch2	11 months ago