Madan Jampani

Fixed merge conflict in InternalMessage

...@@ -15,7 +15,6 @@ public final class InternalMessage implements Message { ...@@ -15,7 +15,6 @@ public final class InternalMessage implements Message {
15 private String type; 15 private String type;
16 private byte[] payload; 16 private byte[] payload;
17 private transient NettyMessagingService messagingService; 17 private transient NettyMessagingService messagingService;
18 - public static final String REPLY_MESSAGE_TYPE = "NETTY_MESSAGIG_REQUEST_REPLY";
19 18
20 // Must be created using the Builder. 19 // Must be created using the Builder.
21 private InternalMessage() {} 20 private InternalMessage() {}
......