mirror of
https://github.com/corda/corda.git
synced 2024-12-19 04:57:58 +00:00
# Conflicts: # constants.properties # core-deterministic/build.gradle # core/src/main/kotlin/net/corda/core/flows/ReceiveTransactionFlow.kt # serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializePublicKeyTest.kt |
||
---|---|---|
.. | ||
integration-test | ||
integration-test-slow/kotlin/net/corda | ||
main | ||
test |