From 5e33ef41d3194735a9673022959a74a89150e590 Mon Sep 17 00:00:00 2001
From: Benjamin <brodriguez@focasoftware.com>
Date: Thu, 23 Jan 2020 16:55:07 -0300
Subject: [PATCH] arreglo de commit

---
 .../modules/seleccion-articulos/seleccion-articulos.component.scss | 3 ---
 src/app/shared/footer/footer.component.html                        | 7 +------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss b/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
index 6fde77f..5c30530 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
@@ -10,9 +10,6 @@ $primary: #aa006b;
   border-top: 3px solid $primary !important;
   border-left: 3px solid $primary !important;
   border-right: 3px solid $primary !important;
-  .border {
-    opacity: 40%;
-  }
 }
 
 .border-bottom-effect {
diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html
index ad5e12e..edc051b 100644
--- a/src/app/shared/footer/footer.component.html
+++ b/src/app/shared/footer/footer.component.html
@@ -1,12 +1,7 @@
 <div class="row w-90 mx-auto h-100 justify-content-between bg-white">
   <div class="col-auto align-self-center px-0 bg-white">
-<<<<<<< HEAD
-    <div class="btn-effect row mx-0 bg-light">
-      <div class="col-auto align-self-center text-primary">ADAPTAR PANTALLA</div>
-=======
     <div class="btn-effect row mx-0 bg-light"  (click)="reducirPantalla()">
-      <div class="col-auto align-self-center text-primary">REDUCIR PANTALLA</div>
->>>>>>> 6877b1afabb0331da524a83d12700a7030e991eb
+      <div class="col-auto align-self-center text-primary">ADAPTAR PANTALLA</div>
       <div class="col-auto p-0 bg-primary d-none d-sm-block">
         <img
           draggable="false"
-- 
1.9.1