Fix merge conflict

raikasdev · Aug 31, 2024 · e1301e6 · e1301e6
1 parent e57aff5
commit e1301e6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,10 +1,6 @@
 #Sun Aug 25 23:56:38 EEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-<<<<<<< HEAD
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
-=======
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
->>>>>>> 2cfb656a05332f3a4c5291a04ee57404fd5a4b94
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists