resolve conflicts

1e983db5 · jialinsun · c80f71d8 · 1e983db5
隐藏空白更改
内联并排

Showing with 0 addition and 4 deletion

cat-home/pom.xml cat-home/pom.xml +0 -4

未找到文件。
--- a/cat-home/pom.xml
+++ b/cat-home/pom.xml
@@ -161,12 +161,8 @@
 								${basedir}/src/main/resources/META-INF/dal/model/monitor-rules-manifest.xml,
 								${basedir}/src/main/resources/META-INF/dal/model/alertconfig-manifest.xml,
 								${basedir}/src/main/resources/META-INF/dal/model/alertsummary-manifest.xml,
-<<<<<<< HEAD
 								${basedir}/src/main/resources/META-INF/dal/model/thirdParty-manifest.xml,
                            </manifest>
-=======
-							</manifest>
->>>>>>> 3e3e41e0b99c7f6ccbc47eee11d96e67a9ff45fd
 						</configuration>
 					</execution>
 					<execution>