diff options
Diffstat (limited to 'gradle/wrapper/gradle-wrapper.properties')
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b9757b96..352ebc71 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,15 +1,6 @@ -<<<<<<< HEAD -#Thu Oct 29 12:36:21 MSK 2015
+#Thu May 12 12:07:57 MSK 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
-======= -#Thu Oct 29 12:36:21 MSK 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip ->>>>>>> core/master +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|