mirror of
https://github.com/corda/corda.git
synced 2025-03-16 09:05:30 +00:00
# Conflicts: # build.gradle # core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt # core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt # docs/source/cli-ux-guidelines.rst # docs/source/testnet-explorer-corda.rst # finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt # finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt # node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt # node/src/main/kotlin/net/corda/node/Corda.kt # node/src/main/kotlin/net/corda/node/internal/Node.kt # node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/test/kotlin/net/corda/node/internal/NodeTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt # tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt