Fixed merge conflict post maven release

This commit is contained in:
Justin Bankes 2016-07-15 01:33:47 -07:00
parent 8e8b8cf519
commit 4ea091d903

View file

@ -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>