Parcourir la source

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

linbo tang il y a 5 ans
Parent
commit
c903225c7f
1 fichiers modifiés avec 5 ajouts et 0 suppressions
  1. 5 0
      Readme.md

+ 5 - 0
Readme.md

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