From 286d4ec90fa317f88166ee01694752bec5633c8e Mon Sep 17 00:00:00 2001
From: Justin Bankes <jbankes1@gmail.com>
Date: Fri, 15 Jul 2016 01:29:57 -0700
Subject: [PATCH] Fixed merge conflict post maven release

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index de90a8551..d6a1bfbc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
-<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"
-         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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-petclinic</artifactId>
@@ -48,7 +47,7 @@
 
     <scm>
       <developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection>
-      <tag>spring-petclinic-1.0.0</tag>
+      <tag>HEAD</tag>
   </scm>
 
     <dependencyManagement>