fix conflicts

This commit is contained in:
longerian
2017-04-01 12:45:05 +08:00
+1 -1
View File
@@ -44,7 +44,7 @@
GROUP=com.alibaba.android
ARTIFACT=vlayout
VERSION=1
VERSION_NAME=1.0.6
VERSION_NAME=1.0.4
PACKAGING_TYPE=aar
systemProp.compileSdkVersion=23
systemProp.targetSdkVersion=23