Commit 85c4fcb8615fae9b4c4fe3a2d5e323e2b5df8ae7
1 parent
748da0200c
Exists in
develop
arreglo de commit
Showing
1 changed file
with
0 additions
and
5 deletions
Show diff stats
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
| ... | ... | @@ -12,13 +12,8 @@ |
| 12 | 12 | </div> |
| 13 | 13 | </div> |
| 14 | 14 | <!-- CUERPO --> |
| 15 | -<<<<<<< HEAD | |
| 16 | - <div class="row w-100 mr-4 h-50 h-md-70"> | |
| 17 | - <div class="col-12 h-100 px-0 py-2"> | |
| 18 | -======= | |
| 19 | 15 | <div class="row w-100 mr-4 h-50 h-md-70" id="content"> |
| 20 | 16 | <div class="col-12 h-100 px-0 py-3"> |
| 21 | ->>>>>>> 6877b1afabb0331da524a83d12700a7030e991eb | |
| 22 | 17 | <div class="row mx-0 h-100"> |
| 23 | 18 | <!-- FILTRO CATEGORIAS --> |
| 24 | 19 | <div class="col-5 col-sm-3 col-xl-2 h-100"> |