From 5a78eccfba07b5665f93f2e43b591b9e0eba93b3 Mon Sep 17 00:00:00 2001
From: fabio <fabio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 15 Mar 2019 19:59:50 +0000
Subject: [PATCH] bug#13471 dev: Aristides qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@90837 d1611594-4594-4d17-8e1d-87c2c4800839
---
 web/WEB-INF/i3-label_es_MX.label | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 9fb8df672..6af9392bc 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -7867,9 +7867,6 @@ relatorioGratuidadeAGERController.lbDataFin.value = Fecha Final
 relatorioGratuidadeAGERController.lbOrgao.value = Instituición concedente
 editarEmpresaController.usarAliasMapaViagemVenda.ajuda = En la pantalla de Venta o botón de Tarjeta de Viagem deve usar Alias para as Ubicaciones.
 
-<<<<<<< .mine
-
-editarPtovtaAntifraudeController.window.title=Editar Chave Antifraude=======
 editarPtovtaAntifraudeController.window.title=Editar Chave Antifraude
 
 # Custom