Remoção de lixo

Eduardo Santos
1 parent 847424d3
Showing 1 changed file with 0 additions and 3 deletions Show diff stats
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>
...	...	@@ -39,11 +39,8 @@
39	39	<th>Host</th>
40	40	<th>Serie</th>
41	41	<th>Local</th>
42		-<<<<<<< HEAD
43		-=======
44	42	<th>Contador Inicial</th>
45	43	<th>Contador Final</th>
46		->>>>>>> d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd
47	44	<th>Impressões</th>
48	45	<th>Ações</th>
49	46	</tr>
...	...