branch1

Merge branch 'main' of https://bdgit.educoder.net/pkaq98rb7/git-test into branch1
restart
1 changed files with 2 additions and 2 deletions
--- a/test.txt
+++ b/test.txt
@ -1,4 +1,4 @@
-111
+111branch1
 branch1
 branch2
-pull request
+222
Author	SHA1	Message	Date
Louisa	61d85500dd	branch1	2 years ago
Louisa	5b084c47c5	Merge branch 'main' of https://bdgit.educoder.net/pkaq98rb7/git-test into branch1	2 years ago
Louisa	806457f6cf	restart	2 years ago
Louisa	ac52f373dc	blank	2 years ago
Louisa	52fabec067	Merge branch 'branch1' # Conflicts: # test.txt	2 years ago
Louisa	7a42ece48c	master 222	2 years ago
pkaq98rb7	89e60ba231	pr pr	2 years ago