From 9b9688841f8bd1019f81f8bb9056e9e685e78a5b Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 24 Nov 2015 17:45:26 +0000
Subject: [PATCH] Reverse merged revision(s) 45477-45476 from
 sco/AdmVenta/Web/trunk/ventaboletos/web/gui/impressaofiscal/editarTotnaofiscalEmpresa.zul:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50539 d1611594-4594-4d17-8e1d-87c2c4800839
---
 web/gui/impressaofiscal/editarTotnaofiscalEmpresa.zul | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/gui/impressaofiscal/editarTotnaofiscalEmpresa.zul b/web/gui/impressaofiscal/editarTotnaofiscalEmpresa.zul
index 9029967f7..c211f0c1a 100644
--- a/web/gui/impressaofiscal/editarTotnaofiscalEmpresa.zul
+++ b/web/gui/impressaofiscal/editarTotnaofiscalEmpresa.zul
@@ -67,10 +67,7 @@
 						value="@{winEditarTotnaofiscalEmpresa$composer.totnaofiscalEmpresa.descricao}"
 						constraint="no empty"/>
 				</row>
-<<<<<<< .working
                 
-=======
->>>>>>> .merge-right.r50239
             </rows>
         </grid>