aboutsummaryrefslogtreecommitdiff
path: root/gradle/wrapper/gradle-wrapper.properties
diff options
context:
space:
mode:
Diffstat (limited to 'gradle/wrapper/gradle-wrapper.properties')
-rw-r--r--gradle/wrapper/gradle-wrapper.properties9
1 files changed, 9 insertions, 0 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 65a9525c..b9757b96 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
#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
+=======
+#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