v 1.50 & fix conflict

This commit is contained in:
Milos Kozak 2017-06-04 22:37:58 +02:00
commit a3db05ec39

View file

@ -43,8 +43,8 @@ android {
applicationId "info.nightscout.androidaps" applicationId "info.nightscout.androidaps"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 23 targetSdkVersion 23
versionCode 1450 versionCode 1500
version "1.45" version "1.5"
buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", generateGitBuild() buildConfigField "String", "BUILDVERSION", generateGitBuild()
} }