Fixed merge conflict post maven release

This commit is contained in:
Justin Bankes 2016-07-15 01:29:57 -07:00
parent e63e8da531
commit 286d4ec90f

View file

@ -1,6 +1,5 @@
<xml version="1.0" encoding="UTF-8"> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.samples</groupId> <groupId>org.springframework.samples</groupId>
<artifactId>spring-petclinic</artifactId> <artifactId>spring-petclinic</artifactId>
@ -48,7 +47,7 @@
<scm> <scm>
<developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection> <developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection>
<tag>spring-petclinic-1.0.0</tag> <tag>HEAD</tag>
</scm> </scm>
<dependencyManagement> <dependencyManagement>