diff options
| author | Andy Clement <aclement@pivotal.io> | 2021-05-22 19:41:03 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2021-05-22 19:41:03 -0700 |
| commit | 07405dcd77d801bcce1b91a489f56fd1cdffec08 (patch) | |
| tree | e8def1029cb294f67cb5c7b0dd6c7cbb29fc69f0 /aspectjtools | |
| parent | f748de9445d0327b8d4fa8c24fd14743cbf0a328 (diff) | |
| download | aspectj-07405dcd77d801bcce1b91a489f56fd1cdffec08.tar.gz aspectj-07405dcd77d801bcce1b91a489f56fd1cdffec08.zip | |
Fix pom.xml problem
Diffstat (limited to 'aspectjtools')
| -rw-r--r-- | aspectjtools/pom.xml | 5 |
1 files 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> |