Anthony Keenan 235498086f Fix more merge issues

2018-10-26 13:46:03 +01:00

..

integration-test/kotlin/net/corda/testing

ENT-2530 Corda fails when running against PostgreSQL with uppercase schema namespace. (#1412)

2018-10-01 12:04:57 +01:00

main/kotlin/net/corda/testing

Fix more merge issues

2018-10-26 13:46:03 +01:00

test

CORDA-2088: Simplified the TestCordapp public API (#4064)

2018-10-15 10:11:18 +01:00