blob: b9757b9637f26edc3ee9272f320b17ce0606cafc (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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
|
