From 85c4fcb8615fae9b4c4fe3a2d5e323e2b5df8ae7 Mon Sep 17 00:00:00 2001
From: Benjamin <brodriguez@focasoftware.com>
Date: Thu, 23 Jan 2020 16:51:49 -0300
Subject: [PATCH] arreglo de commit

---
 .../modules/seleccion-articulos/seleccion-articulos.component.html   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.html b/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
index 9fd8183..7104132 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
@@ -12,13 +12,8 @@
       </div>
     </div>
     <!-- CUERPO -->
-<<<<<<< HEAD
-    <div class="row w-100 mr-4 h-50 h-md-70">
-      <div class="col-12 h-100 px-0 py-2">
-=======
     <div class="row w-100 mr-4 h-50 h-md-70" id="content">
       <div class="col-12 h-100 px-0 py-3">
->>>>>>> 6877b1afabb0331da524a83d12700a7030e991eb
         <div class="row mx-0 h-100">
           <!-- FILTRO CATEGORIAS -->
           <div class="col-5 col-sm-3 col-xl-2 h-100">
-- 
1.9.1