Merge remote-tracking branch 'remotes/origin/zhangsan_branch'

3 years ago · 7e523ab8f2
parent 100c190e4e 021dd76f48
commit 7e523ab8f2
2 changed files with 2 additions and 0 deletions
--- a/doc/doc1.txt
+++ b/doc/doc1.txt
@ -0,0 +1 @@
+doc1.txt
--- a/newtext2.txt
+++ b/newtext2.txt
@ -0,0 +1 @@
+new text2