From 0e122d6d1613f14711c4fb871c2959197634bbf4 Mon Sep 17 00:00:00 2001
From: Fabio Faria <fabio.fbarreto@totvs.com.br>
Date: Fri, 23 Dec 2022 10:50:15 -0300
Subject: [PATCH] bug#AL-1786

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

diff --git a/pom.xml b/pom.xml
index c3637feed..2d7977d84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-<<<<<<< HEAD
 	<version>1.0.16</version>
-=======
-	<version>1.0.15</version>
->>>>>>> 1448d3b4014cd0df67f5c79033d6adf38599b584
 	
 	<distributionManagement>
         <repository>