Fix merge conflict

This commit is contained in:
Anthony Keenan 2018-09-06 16:41:40 +01:00
parent 230d91046c
commit d58489939b

View File

@ -33,7 +33,7 @@ targetCompatibility = 1.6
jar.enabled = false
task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').compileJava) {
task buildCordaJAR(type: FatCapsule, dependsOn: project(':node').tasks.jar) {
applicationClass 'net.corda.node.Corda'
archiveName "corda-enterprise-${corda_release_version}.jar"
applicationSource = files(