Commit 5423f9fdf8c6f6b00e97736c9a9137e0505729a2
1 parent
847424d3
Exists in
master
and in
2 other branches
Remoção de lixo
Showing
1 changed file
with
0 additions
and
3 deletions
Show diff stats
Resources/views/Printer/index.html.twig
| @@ -39,11 +39,8 @@ | @@ -39,11 +39,8 @@ | ||
| 39 | <th>Host</th> | 39 | <th>Host</th> |
| 40 | <th>Serie</th> | 40 | <th>Serie</th> |
| 41 | <th>Local</th> | 41 | <th>Local</th> |
| 42 | -<<<<<<< HEAD | ||
| 43 | -======= | ||
| 44 | <th>Contador Inicial</th> | 42 | <th>Contador Inicial</th> |
| 45 | <th>Contador Final</th> | 43 | <th>Contador Final</th> |
| 46 | ->>>>>>> d4656e0e44b6f43d88cea85fd3ca4cd16f0e76fd | ||
| 47 | <th>Impressões</th> | 44 | <th>Impressões</th> |
| 48 | <th>Ações</th> | 45 | <th>Ações</th> |
| 49 | </tr> | 46 | </tr> |