fix the conflicts in build.gradle

This commit is contained in:
haoeliu@foxmail.com 2022-11-29 15:22:44 +08:00
parent 14e5fffe1d
commit 76a8e3ca58

View File

@ -6,11 +6,8 @@ plugins {
} }
group = "org.bdware.sc" group = "org.bdware.sc"
<<<<<<< HEAD
version = "2.0.0" version = "2.0.0"
=======
version = "1.7.2"
>>>>>>> origin/master
repositories { repositories {
mavenCentral() mavenCentral()
mavenLocal() mavenLocal()