Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up merge issues and warnings in POM files

Browse Source
This commit is contained in:
Michael Minella
2013-11-22 17:12:22 -06:00
parent 3dcbb44906
commit 8bee7ac310
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-infrastructure-tests/pom.xml
View File

@@ -57,11 +57,7 @@
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-infrastructure</artifactId>
<<<<<<< HEAD
<version>3.0.0.BUILD-SNAPSHOT</version>
=======
<version>2.2.3.RELEASE</version>
>>>>>>> [maven-release-plugin] prepare release 2.2.3.RELEASE
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>