mirror of
https://github.com/corda/corda.git
synced 2025-03-25 21:38:06 +00:00
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