Chris Rankin a287673432 Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge ...

Conflicts:
	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
	node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt

2018-08-20 15:46:20 +01:00

..

runConfigurations

ENT-1986: Extend node HA test scenario to support LinearState. (#893)

2018-05-31 11:14:59 +01:00

scopes

Add an IntelliJ scope that covers the currently supported Corda API.

2017-09-27 11:47:34 +02:00

codeStyleSettings.xml

Initial stub for IntelliJ Code Style settings (#1832)

2017-10-09 13:24:17 +01:00

compiler.xml

Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge

2018-08-20 15:46:20 +01:00