Andy Clement
3 years ago
1 changed files with 2 additions and 3 deletions
+ 2
- 3
aspectjtools/pom.xml
View File
| <version>${project.version}</version> | <version>${project.version}</version> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | <dependency> | ||||
| <<<<<<< HEAD | |||||
| <groupId>org.ow2.asm</groupId> | <groupId>org.ow2.asm</groupId> | ||||
| <artifactId>asm</artifactId> | <artifactId>asm</artifactId> | ||||
| ======= | |||||
| </dependency> | |||||
| <dependency> | |||||
| <groupId>org.aspectj</groupId> | <groupId>org.aspectj</groupId> | ||||
| <artifactId>util</artifactId> | <artifactId>util</artifactId> | ||||
| <version>${project.version}</version> | <version>${project.version}</version> | ||||
| <groupId>org.aspectj</groupId> | <groupId>org.aspectj</groupId> | ||||
| <artifactId>taskdefs</artifactId> | <artifactId>taskdefs</artifactId> | ||||
| <version>${project.version}</version> | <version>${project.version}</version> | ||||
| >>>>>>> xander/maven-central-deployment | |||||
| </dependency> | </dependency> | ||||
| </dependencies> | </dependencies> | ||||
Loading…