Fix merge

This commit is contained in:
Tudor Malene 2018-05-14 16:05:30 +01:00 committed by tudor.malene@gmail.com
parent 95054f71d5
commit ec20359518

View File

@ -283,6 +283,7 @@ data class DriverParameters(
debugPortAllocation, debugPortAllocation,
systemProperties, systemProperties,
useTestClock, useTestClock,
true,
startNodesInProcess, startNodesInProcess,
waitForAllNodesToFinish, waitForAllNodesToFinish,
notarySpecs, notarySpecs,
@ -326,6 +327,7 @@ data class DriverParameters(
debugPortAllocation, debugPortAllocation,
systemProperties, systemProperties,
useTestClock, useTestClock,
true,
startNodesInProcess, startNodesInProcess,
waitForAllNodesToFinish, waitForAllNodesToFinish,
notarySpecs, notarySpecs,