mirror of
https://gitee.com/BDWare/cp.git
synced 2025-01-10 09:54:07 +00:00
fix the conflicts in build.gradle
This commit is contained in:
parent
14e5fffe1d
commit
76a8e3ca58
@ -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()
|
||||||
|
Loading…
Reference in New Issue
Block a user