restart

blank
Merge branch 'branch1'
1 changed files with 2 additions and 3 deletions
--- a/test.txt
+++ b/test.txt
@ -1,4 +1,3 @@
-1111
+111
 branch1
-branch2
-pull request
+branch2
Author	SHA1	Message	Date
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
Louisa	225989e474	branch1	2 years ago