ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-06 09:21:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix bad merge conflict resolution.

Browse Source
This commit is contained in:
rick.parker 2018-09-24 10:34:26 +01:00
parent 5469e41458
commit bca2d50e31
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/src/main/kotlin/net/corda/node/internal/Node.kt
View File

@ -197,7 +197,6 @@ open class Node(configuration: NodeConfiguration,
nodeExecutor = serverThread, nodeExecutor = serverThread,
database = database, database = database,
networkMap = networkMapCache, networkMap = networkMapCache,
metricRegistry = metricRegistry,
isDrainingModeOn = nodeProperties.flowsDrainingMode::isEnabled, isDrainingModeOn = nodeProperties.flowsDrainingMode::isEnabled,
drainingModeWasChangedEvents = nodeProperties.flowsDrainingMode.values, drainingModeWasChangedEvents = nodeProperties.flowsDrainingMode.values,
metricRegistry = metricRegistry, metricRegistry = metricRegistry,