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

---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9aad04458..de90a8551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,10 @@
-<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"
          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>
-<<<<<<< HEAD
     <version>1.0.0-SNAPSHOT</version>
-=======
-    <version>1.0.0</version>
->>>>>>> 01e0e14dae2ef7bb46e5b5e506c7d0f593a06725
 
     <name>petclinic</name>
     <packaging>war</packaging>