ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-15 00:36:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Dominic Fox 2018-11-23 14:35:47 +00:00
parent 9b15d4dafb
commit 729469483f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
View File

@ -45,7 +45,7 @@ class NodeSchemaService(private val extraSchemas: Set<MappedSchema> = emptySet()
PersistentIdentityService.PersistentIdentityNames::class.java,
ContractUpgradeServiceImpl.DBContractUpgrade::class.java,
RunOnceService.MutualExclusion::class.java,
PersistentKeyManagementService.PublicKeyHashToExternalId::class.java)
PersistentKeyManagementService.PublicKeyHashToExternalId::class.java)) {
override val migrationResource = "node-core.changelog-master"
}