Merge branch 'master' of http://dev.ccwin-in.com:3000/QADSRC/QAD

# Conflicts: # 新建文本文档.txt
22
1 changed files with 2 additions and 1 deletions
--- a/新建文本文档.txt
+++ b/新建文本文档.txt
@ -1,3 +1,4 @@
 11

-22
+
+222
Author	SHA1	Message	Date
宁红钢	924272535d	Merge branch 'master' of http://dev.ccwin-in.com:3000/QADSRC/QAD # Conflicts: # 新建文本文档.txt	2 years ago
宁红钢	550b29f313	22	2 years ago