From 23e4f4cb6f6afb790a9d5b05d1c15297a8375084 Mon Sep 17 00:00:00 2001
From: Anthony Keenan <anthony.keenan@r3.com>
Date: Mon, 26 Mar 2018 15:52:00 +0100
Subject: [PATCH] Fix merge conflicts

---
 .../net/corda/node/services/events/NodeSchedulerServiceTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt b/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
index 915b8f9fe1..38919396fe 100644
--- a/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
+++ b/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
@@ -91,7 +91,7 @@ open class NodeSchedulerServiceTestBase {
 
     protected fun assertStarted(flowLogic: FlowLogic<*>) {
         // Like in assertWaitingFor, use timeout to make verify wait as we often race the call to startFlow:
-        verify(flowStarter, timeout(5000)).startFlow(same(flowLogic)!!, any())
+        verify(flowStarter, timeout(5000)).startFlow(same(flowLogic)!!, any(), any())
     }
 
     protected fun assertStarted(event: Event) = assertStarted(event.flowLogic)