From 5423f9fdf8c6f6b00e97736c9a9137e0505729a2 Mon Sep 17 00:00:00 2001
From: Eduardo Santos <eduardo.edusantos@gmail.com>
Date: Wed, 9 Jul 2014 11:02:11 -0300
Subject: [PATCH] Remoção de lixo

---
 Resources/views/Printer/index.html.twig | 3 ---
 1 file changed, 0 insertions(+), 3 deletions(-)

diff --git a/Resources/views/Printer/index.html.twig b/Resources/views/Printer/index.html.twig
index d2ccbfd..7386fe6 100755
--- a/Resources/views/Printer/index.html.twig
+++ b/Resources/views/Printer/index.html.twig
@@ -39,11 +39,8 @@
                 <th>Host</th>
                 <th>Serie</th>
                 <th>Local</th>
-<<<<<<< HEAD
-=======
                 <th>Contador Inicial</th>
                 <th>Contador Final</th>
->>>>>>> d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd
                 <th>Impressões</th>
                 <th>Ações</th>
             </tr>
--
libgit2 0.21.2