Browse Source

Merge branch 'master' of 122.112.209.52:liy/test

# Conflicts:
#	test.txt
liy 4 years ago
parent
commit
8844acf5d6
1 changed files with 1 additions and 1 deletions
  1. 1 1
      test.txt

+ 1 - 1
test.txt

@@ -1,3 +1,3 @@
 push 2.0
 
-push 3.0
+push 4.0