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

Resolvendo conflito merge

master
Gleimar Botelho Baleeiro 2023-11-08 18:19:02 -03:00
parent 6263b61f1c 3fea93bbc5
commit 59d0fd21f8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -4,7 +4,6 @@
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ModelWeb</artifactId> <artifactId>ModelWeb</artifactId>
<version>1.20.0</version> <version>1.20.0</version>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>rj-releases</id> <id>rj-releases</id>
@ -176,7 +175,7 @@
<dependency> <dependency>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>GeneradorBoletosCNAB</artifactId> <artifactId>GeneradorBoletosCNAB</artifactId>
<version>1.2.0</version> <version>1.2.1</version>
</dependency> </dependency>
<dependency> <dependency>
@ -235,4 +234,4 @@
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
</dependencyManagement> </dependencyManagement>
</project> </project>