diff options
| author |  Vitaly Takmazov | 2016-07-07 11:52:56 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-07-07 11:52:56 +0300 |
| commit | 01eada11aafcb712a366ce816c98c660f5ea6907 (patch) | |
| tree | be34a296d2a35b24c360a17499c68a028cb88965 /gradle | |
| parent | 201ed4cdb586c8516d1ec13b90cd615cc030a705 (diff) | |
| parent | fbedd4f7784f0cb651cc8105c656a1c20da0e2d5 (diff) | |
merge core develop
Diffstat (limited to 'gradle')
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 9 |
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 |