Home Explore Help
Register Sign In
linbo.tang
/
alpha
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

feat(Readme):增加提交到sit分支功能。

linbo tang 5 years ago
parent
fc76d8250b
commit
c903225c7f
1 changed files with 5 additions and 0 deletions
Unified View Show Diff Stats
  1. 5 0
      Readme.md

+ 5 - 0
Readme.md
View File 

@@ -1 +1,6 @@
 
 This is a alpha project.
 
 This is a alpha project.
 
+<<<<<<< HEAD
 
+=======
 
+This is a commit from dev.
 
+This is a commit need merge to sit.
 
+>>>>>>> 3d10841... feat(Readme):增加提交到sit分支功能。