fixes bug#1786
parent
4cac0a7989
commit
18beee4088
12
pom.xml
12
pom.xml
|
@ -3,11 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ventaboletosadm</artifactId>
|
<artifactId>ventaboletosadm</artifactId>
|
||||||
<<<<<<< HEAD
|
|
||||||
<version>1.0.21</version>
|
<version>1.0.21</version>
|
||||||
=======
|
|
||||||
<version>1.0.20</version>
|
|
||||||
>>>>>>> 11814ff744465ad2b115f0e2b25bd1a5cc2e7dea
|
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
@ -59,21 +55,13 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ModelWeb</artifactId>
|
<artifactId>ModelWeb</artifactId>
|
||||||
<<<<<<< HEAD
|
|
||||||
<version>1.0.16</version>
|
<version>1.0.16</version>
|
||||||
=======
|
|
||||||
<version>1.0.15</version>
|
|
||||||
>>>>>>> 11814ff744465ad2b115f0e2b25bd1a5cc2e7dea
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>Flyway</artifactId>
|
<artifactId>Flyway</artifactId>
|
||||||
<<<<<<< HEAD
|
|
||||||
<version>1.0.7</version>
|
<version>1.0.7</version>
|
||||||
=======
|
|
||||||
<version>1.0.6</version>
|
|
||||||
>>>>>>> 11814ff744465ad2b115f0e2b25bd1a5cc2e7dea
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
Loading…
Reference in New Issue