Update pom.xml

dingjs · dingjs · commit 033116c370e6 · 2015-09-21T23:18:13.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -8,9 +8,7 @@
 	<packaging>jar</packaging>
 
 	<build>
-<<<<<<< HEAD
 		<finalName>simpleApm</finalName>
-=======
 		<sourceDirectory>src</sourceDirectory>
 		<outputDirectory>target/classes</outputDirectory>
 		<resources>
