fix some merge issues

This commit is contained in:
Jesse Boyd
2019-11-19 22:07:30 +00:00
parent 5d8adbc10c
commit 0e22d4718a
4 changed files with 39 additions and 495 deletions

View File

@ -34,8 +34,8 @@ dependencies {
val antlrVersion = "4.7.2"
"antlr"("org.antlr:antlr4:$antlrVersion")
"implementation"("org.antlr:antlr4-runtime:$antlrVersion")
"compile"("com.googlecode.json-simple:json-simple:1.3.9") { isTransitive = false }
"compile"("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false }
"compileOnly"(project(":worldedit-libs:core:ap"))
"annotationProcessor"(project(":worldedit-libs:core:ap"))
// ensure this is on the classpath for the AP