Fix a pom confilct.

2017-11-09 09:17:29 +08:00 · 2017-11-09 09:17:29 +08:00 · 737e9c53b3
parent 3169f827e6
commit 737e9c53b3
1 changed files with 0 additions and 5 deletions
--- 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