Merge branch 'master' of http://yunpi.tpddns.cn:3000/lisl/gitTest.git

Conflicts: src/gitTest/Test.java
1 year ago · 827464cecc
parent af80073b76 1b5e462d24
commit 827464cecc
1 changed files with 1 additions and 0 deletions
--- a/src/gitTest/Test.java
+++ b/src/gitTest/Test.java
@ -4,4 +4,5 @@ public class Test {
 	String assString;
 	String abString;
 	String cString;
+    String dddString;
 }