DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-17 21:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflict post maven release

Browse source
This commit is contained in:
Justin Bankes 2016-07-15 01:25:45 -07:00
commit e4df4d21f3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pom.xml
View file

@ -4,7 +4,11 @@
<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>
<<<<<<< HEAD
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
=======
<version>1.0.0</version>
>>>>>>> 01e0e14dae2ef7bb46e5b5e506c7d0f593a06725
<name>petclinic</name> <name>petclinic</name>
<packaging>war</packaging> <packaging>war</packaging>
@ -48,7 +52,7 @@
<scm> <scm>
<developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection> <developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection>
<tag>HEAD</tag> <tag>spring-petclinic-1.0.0</tag>
</scm> </scm>
<dependencyManagement> <dependencyManagement>