From 7cc48b79c367494663a34b06a3ecf6553695b51e Mon Sep 17 00:00:00 2001
From: Yang <ychescale9@gmail.com>
Date: Fri, 14 Feb 2020 14:59:02 +1100
Subject: [PATCH] Fix gradle wrapper version. (#102)

---
 gradle/wrapper/gradle-wrapper.properties | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8f17dcf..b9442c2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,10 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-<<<<<<< Updated upstream
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
-||||||| merged common ancestors
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-milestone-2-all.zip
-=======
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip
->>>>>>> Stashed changes