From 729469483f4b47f21288b0f959194caab875086d Mon Sep 17 00:00:00 2001
From: Dominic Fox <dominic.fox@r3.com>
Date: Fri, 23 Nov 2018 14:35:47 +0000
Subject: [PATCH] Resolve merge conflict

---
 .../kotlin/net/corda/node/services/schema/NodeSchemaService.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt b/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
index 5c9b99ef19..e835f34a35 100644
--- a/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
+++ b/node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
@@ -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"
     }