Merge pull request '1' (#9) from develop into master

3 years ago · 1e05250d62
parent fdf7a1af15 b4336f58cf
commit 1e05250d62
2 changed files with 3 additions and 2 deletions
--- a/111.txt
+++ b/111.txt
@ -2,4 +2,4 @@
 develop
 a_branch
 333
-develop
+develop
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1 +1,2 @@
-11
+11
 b_branch