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

correção conflito

master
Fabio 2024-05-21 18:41:41 -03:00
parent 4d1ba74674
commit ba6cd776fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -4,12 +4,12 @@
<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>
<version>1.77.0</version> <version>1.78.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.58.0</modelWeb.version> <modelWeb.version>1.59.0</modelWeb.version>
<flyway.version>1.45.0</flyway.version> <flyway.version>1.44.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
@ -126,7 +126,7 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>GeneradorBoletosCNAB</artifactId> <artifactId>GeneradorBoletosCNAB</artifactId>
<version>1.7.0</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>