From 18beee40882571c9fd63346e433cfaa542480656 Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Fri, 23 Dec 2022 08:38:32 -0300
Subject: [PATCH] fixes bug#1786

---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 533af0829..844ee13f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-<<<<<<< HEAD
 	<version>1.0.21</version>
-=======
-	<version>1.0.20</version>
->>>>>>> 11814ff744465ad2b115f0e2b25bd1a5cc2e7dea
 	<packaging>war</packaging>
 
 	<distributionManagement>
@@ -59,21 +55,13 @@
 		<dependency>
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>ModelWeb</artifactId>
-<<<<<<< HEAD
 			<version>1.0.16</version>			
-=======
-			<version>1.0.15</version>			
->>>>>>> 11814ff744465ad2b115f0e2b25bd1a5cc2e7dea
 		</dependency>
 		
 		<dependency>
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>Flyway</artifactId>
-<<<<<<< HEAD
 			<version>1.0.7</version>
-=======
-			<version>1.0.6</version>
->>>>>>> 11814ff744465ad2b115f0e2b25bd1a5cc2e7dea
 		</dependency>
 		
 		<dependency>