From 737e9c53b3a9b2fe375124f7491bf36bde3c38e7 Mon Sep 17 00:00:00 2001
From: wu-sheng <wu.sheng@foxmail.com>
Date: Thu, 9 Nov 2017 09:17:29 +0800
Subject: [PATCH] Fix a pom confilct.

---
 .../apm-collector-agent/collector-agent-stream/pom.xml       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
index 9075a16ae..71243c5f4 100644
--- a/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
+++ b/apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
@@ -30,7 +30,6 @@
     <artifactId>collector-agent-stream</artifactId>
     <packaging>jar</packaging>
 
-<<<<<<< HEAD
     <dependencies>
         <dependency>
             <groupId>org.skywalking</groupId>
@@ -39,7 +38,3 @@
         </dependency>
     </dependencies>
 </project>
-=======
-
-</project>
->>>>>>> 406c4f52d8251eb81aa868ec38f17789e18e0dc0