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

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 99eba0efb..a74ac45fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-petclinic</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <name>petclinic</name>
     <packaging>war</packaging>