handle conflict

baomingyu · baomingyu · commit 060562537c4b · 2022-01-20T20:32:28.000+08:00
diff --git a/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java b/inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/source/ServerMessageHandler.java
@@ -726,11 +726,6 @@ private String getTopic(String groupId, String streamId) {
 
     /**
      * addMetric
-<<<<<<< HEAD
-     * 
-=======
-     *
->>>>>>> add udp feature
      * @param result
      * @param size
      */
