Removing another crappy maven merge attempt

This commit is contained in:
Ben Hale
2008-10-27 11:00:20 +00:00
parent ab184588dc
commit 4e9c71fd6f
7 changed files with 57 additions and 24 deletions

View File

@@ -1,9 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3.0.RC1</version>
<version>1.3.0.CI-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-integration-tests</artifactId>
@@ -97,4 +101,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>