From 07405dcd77d801bcce1b91a489f56fd1cdffec08 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Sat, 22 May 2021 19:41:03 -0700
Subject: [PATCH] Fix pom.xml problem

---
 aspectjtools/pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index dae023141..f41e7e8a8 100644
--- 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>
 
-- 
2.39.5