Fix pom.xml problem

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index dae0231414ad534abc5c758fd2495917f90c89bb..f41e7e8a85bcde1b9f2c97a6ee84009b59b52af2 100644 (file)
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -333,10 +333,10 @@
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-<<<<<<< HEAD
                        <groupId>org.ow2.asm</groupId>
                        <artifactId>asm</artifactId>
-=======
+               </dependency>
+               <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>util</artifactId>
                        <version>${project.version}</version>
@@ -395,7 +395,6 @@
                        <groupId>org.aspectj</groupId>
                        <artifactId>taskdefs</artifactId>
                        <version>${project.version}</version>
->>>>>>> xander/maven-central-deployment
                </dependency>
        </dependencies>