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:26:59 -07:00
parent e4df4d21f3
commit e63e8da531
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pom.xml
View file

@ -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" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<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>