Fix maven version
This commit is contained in:
parent
a3abf726da
commit
77e198e8b3
4
pom.xml
4
pom.xml
|
@ -2,11 +2,7 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>irish-monitor-service</artifactId>
|
<artifactId>irish-monitor-service</artifactId>
|
||||||
<<<<<<< HEAD
|
|
||||||
<version>1.0.5-BETA-SNAPSHOT</version>
|
<version>1.0.5-BETA-SNAPSHOT</version>
|
||||||
=======
|
|
||||||
<version>1.0.5-SNAPSHOT</version>
|
|
||||||
>>>>>>> origin/master
|
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>irish-monitor-service</name>
|
<name>irish-monitor-service</name>
|
||||||
<scm>
|
<scm>
|
||||||
|
|
Loading…
Reference in New Issue