Browse Source

dev分支

傅行帆 6 years ago
parent
commit
98a1b5a448
1 changed files with 1 additions and 6 deletions
  1. 1
    6
      README.md

+ 1
- 6
README.md View File

@@ -1,6 +1 @@
1
-<<<<<<< HEAD
2
-weiximei
3
-测试提交以下
4
-=======
5
-weiximei dx
6
->>>>>>> f3d574abbfe87a47385fb0bf8db160e136bf4f2a
1
+开发分支,不断迭代