pgf2i68xt
/
gittest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'branch2'

Browse Source 
# Conflicts:
#	1.txt
branch1
HeQiJin 8 months ago
parent 5633899b1d 4c62162bcc
commit 24a5aefdc2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File

6
1.txt
Unescape View File

@ -1,3 +1,7 @@
42120412 42120412
branch1 branch1
branch2 <<<<<<< HEAD
branch2
=======
branch2
>>>>>>> branch2

Write Preview
Loading…
Cancel
Save