commit 9621ba1d8b1c5560285f66e8b998c426d9673675
author Madan Jampani <madan@onlab.us> Tue Oct 07 12:45:44 2014 -0700
committer Madan Jampani <madan@onlab.us> Tue Oct 07 12:45:44 2014 -0700
tree 486a281094e4e1bb14dab1b6db73b4681b0b75b6
parent 53e44e623a155c2cf53f3d7e05d082864f1acb58

Fixed merge conflict in InternalMessage

utils/netty/src/main/java/org/onlab/netty/InternalMessage.java

diff --git a/utils/netty/src/main/java/org/onlab/netty/InternalMessage.java b/utils/netty/src/main/java/org/onlab/netty/InternalMessage.java
index c535f7b..938ec7b 100644
--- a/utils/netty/src/main/java/org/onlab/netty/InternalMessage.java
+++ b/utils/netty/src/main/java/org/onlab/netty/InternalMessage.java
@@ -15,7 +15,6 @@
     private String type;
     private byte[] payload;
     private transient NettyMessagingService messagingService;
-    public static final String REPLY_MESSAGE_TYPE = "NETTY_MESSAGIG_REQUEST_REPLY";
 
     // Must be created using the Builder.
     private InternalMessage() {}