Shenlin

Update readme.md

...@@ -10,6 +10,8 @@ new tag 1.1 ...@@ -10,6 +10,8 @@ new tag 1.1
10 10
11 from gitlab editor 11 from gitlab editor
12 12
13 +conflict from server
14 +
13 add local note 15 add local note
14 16
15 add 17 add
......