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

reverte de commit errado 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@50538 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2015-11-24 17:42:42 +00:00
parent ad55467b58
commit 59d0ceed1d
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/gui/impressaofiscal/busquedaTotnaofiscalEmpresa.zul
View File

@ -57,23 +57,11 @@
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaTotnaofiscalEmpresaController.tipototalizador.label')}" sort="auto(tipototalizador)"/> label="${c:l('busquedaTotnaofiscalEmpresaController.tipototalizador.label')}" sort="auto(tipototalizador)"/>
<<<<<<< .working
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
=======
<listheader image="/gui/img/create_doc.gif"
>>>>>>> .merge-right.r50239
label="${c:l('busquedaTotnaofiscalEmpresaController.descricao.label')}" sort="auto(descricao)"/> label="${c:l('busquedaTotnaofiscalEmpresaController.descricao.label')}" sort="auto(descricao)"/>
<<<<<<< .working
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaTotnaofiscalEmpresaController.tipoeventoextra.label')}" sort="auto(tipoeventoextra.descTipoEvento)"/> label="${c:l('busquedaTotnaofiscalEmpresaController.tipoeventoextra.label')}" sort="auto(tipoeventoextra.descTipoEvento)"/>
=======
<listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaTotnaofiscalEmpresaController.tipoeventoextra.label')}" sort="auto(tipoeventoextra.descTipoEvento)"/>
>>>>>>> .merge-right.r50239
</listhead> </listhead>
</listbox> </listbox>