mirror of
https://github.com/corda/corda.git
synced 2024-12-20 21:43:14 +00:00
8eab8653cd
Conflicts: node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt node-api/src/main/kotlin/net/corda/nodeapi/internal/rpc/client/AMQPClientSerializationScheme.kt |
||
---|---|---|
.. | ||
src | ||
build.gradle |