From d58489939bc21b3de5999f9fea33aeb0508f988d Mon Sep 17 00:00:00 2001
From: Anthony Keenan <anthony.keenan@r3.com>
Date: Thu, 6 Sep 2018 16:41:40 +0100
Subject: [PATCH] Fix merge conflict

---
 node/capsule/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/capsule/build.gradle b/node/capsule/build.gradle
index bed8a224c5..20b074bebc 100644
--- a/node/capsule/build.gradle
+++ b/node/capsule/build.gradle
@@ -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(