mirror of
https://github.com/corda/corda.git
synced 2025-03-29 15:16:19 +00:00
# Conflicts: # node/src/main/kotlin/net/corda/node/services/statemachine/Event.kt # node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt # node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt # node/src/main/kotlin/net/corda/node/services/statemachine/transitions/TopLevelTransition.kt