aboutsummaryrefslogtreecommitdiff
path: root/gradle/wrapper
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-07-07 11:53:39 +0300
committerGravatar Vitaly Takmazov2016-07-07 11:54:33 +0300
commita73729a646f6f1520e898fcf4a9422ee5c804fe9 (patch)
tree1822c9b631e170c9e0e14e677f0a59e7b742b66c /gradle/wrapper
parent01eada11aafcb712a366ce816c98c660f5ea6907 (diff)
fix gradle wrapper
Diffstat (limited to 'gradle/wrapper')
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin53637 -> 51106 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties13
2 files changed, 2 insertions, 11 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 05ef575b..3c7abdf1 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
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