zhangziteng
/
TestBranch
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of http://gitea.xinje.cc/zhangziteng/TestBranch 

# Conflicts:
#	1.txt
master
ZTZHANG\ztzhang 2 days ago
parent
3534f26872 f180c8b8ea
commit
2fd513762c
1 changed files with 5 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -1
      1.txt

+ 5
- 1
1.txt View File

@@ -1,5 +1,9 @@
主分支 1
主分支 2 远程分支 1
主分支 3
<<<<<<< HEAD

本地修改 冲突
本地修改 冲突
=======
远程修改 冲突
>>>>>>> f180c8b8ea0c80e7c07e2dc10aa8d2639b2729b6

Write Preview
Loading…
Cancel
Save