From a73729a646f6f1520e898fcf4a9422ee5c804fe9 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 7 Jul 2016 11:53:39 +0300
Subject: fix gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 53637 -> 51106 bytes
 gradle/wrapper/gradle-wrapper.properties |  13 ++-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'gradle/wrapper')

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 05ef575b..3c7abdf1 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar 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
-- 
cgit v1.2.3