From 549d2710479d11f96926c9c705767d5b54909b06 Mon Sep 17 00:00:00 2001
From: Tudor Malene <tudor.malene@gmail.com>
Date: Tue, 6 Mar 2018 14:04:23 +0000
Subject: [PATCH] fix merge

---
 .../r3/enclaves/txverify/EnclaveletSerializationScheme.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
index 38c75114b3..99b546ba8d 100644
--- a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
+++ b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
@@ -6,7 +6,7 @@ import net.corda.core.serialization.internal.SerializationEnvironmentImpl
 import net.corda.core.serialization.internal.nodeSerializationEnv
 import net.corda.core.utilities.toHexString
 import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
-import net.corda.nodeapi.internal.serialization.KRYO_P2P_CONTEXT
+import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
 import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
 import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
 import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
@@ -27,10 +27,10 @@ private class EnclaveletSerializationScheme {
                     registerScheme(AMQPVerifierSerializationScheme)
                 },
                 /**
-                 * Even though default context is set to Kryo P2P, the encoding will be adjusted depending on the
+                 * Even though default context is set to Amqp P2P, the encoding will be adjusted depending on the
                  * incoming request received.
                  */
-                KRYO_P2P_CONTEXT)
+                AMQP_P2P_CONTEXT)
 
             /*
              * Ensure that we initialise JAXP before blacklisting is enabled.