fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug#AL-1786 

Resolução de conflitos
master
Fabio Faria 2022-12-23 08:36:27 -03:00
parent 23add3750b 11814ff744
commit 4cac0a7989
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -3,7 +3,11 @@
<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>
@ -55,13 +59,21 @@
<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>