mirror of
https://github.com/corda/corda.git
synced 2025-03-15 16:46:12 +00:00
Fix merge conflict
This commit is contained in:
parent
230d91046c
commit
d58489939b
@ -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(
|
||||
|
Loading…
x
Reference in New Issue
Block a user