Merge conflict resolved

This commit is contained in:
nextLane 2017-03-12 00:33:16 +05:30
commit 0de8c44fd2
2 changed files with 3 additions and 3 deletions

View file

@ -5,7 +5,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:2.3.0'
} }
} }

View file

@ -1,6 +1,6 @@
#Wed Aug 17 16:02:52 NZST 2016 #Fri Mar 03 19:41:57 IST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip