Fix a pom confilct.

737e9c53 · wu-sheng · 3169f827 · 737e9c53
隐藏空白更改
内联并排

Showing with 0 addition and 5 deletion

apm-collector/apm-collector-agent/collector-agent-stream/pom.xml ...lector/apm-collector-agent/collector-agent-stream/pom.xml +0 -5

未找到文件。
--- 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