fix(gradle) resolve merge conflicts in pull request #14

fix erroneous change in gradle version
purrprogramming · Jan 27, 2017 · 36120c4 · 36120c4
1 parent c5f5ae9
commit 36120c4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,3 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip