Merge pull request '1' (#4) from wzh_branch into develop

3 years ago · c69dd72c41
parent 7abf315f07 f289726e8e
commit c69dd72c41
1 changed files with 4 additions and 2 deletions
--- a/1.txt
+++ b/1.txt
@ -1,3 +1,5 @@
 12
-wzh_branch
-qwer
+wzp_branch
+qwer123
+
+