From 128d72e676cb6b85e91e450ff10f5c15e2def8fa Mon Sep 17 00:00:00 2001
From: Martin <mmacola@focasoftware.com>
Date: Tue, 15 Oct 2019 12:28:52 -0300
Subject: [PATCH] Merge conflicts

---
 src/views/foca-login.html | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/views/foca-login.html b/src/views/foca-login.html
index 7eaa393..915d20a 100644
--- a/src/views/foca-login.html
+++ b/src/views/foca-login.html
@@ -1,9 +1,9 @@
-<img src="img/logo.png" class="w-25 rounded mx-auto d-block">
-<div class="login mt-5 p-3 border-0">
-    <form name="login">
-        
-            <div class="login-titulo">
-            <span>Ingreso de usuario</span>
+<div class="row mt-5 overflow-hidden">
+    <div class="col p-0">
+        <div class="row mt-5 justify-content-center">
+            <div class="col-auto p-0">
+                <img src="./img/logofoca.png" alt="Debo Logo">
+            </div>
         </div>
         
         <div class="row justify-content-center m-5">
@@ -58,28 +58,5 @@
                 </form>
             </div>
         </div>
-<<<<<<< HEAD
-        <div class="login-campo">
-            <label>Contraseña</label>
-            <input
-                id         = "password"
-                type       = "password"
-                ng-model   = "usuario.clave"
-                foca-focus = "paso == 2"
-                ng-keyup   = "$event.keyCode == 13 && enviar()"
-                ladda      = "loginLoading"
-                teclado-virtual
-            />
-        </div>
-        <button
-            type="button"
-            ng-click="enviar()"
-            class="login-button btn mt-3 btn-login"
-            ladda="loginLoading"
-        >Ingresar</button>
-    </form>
-    <img src="img/logo-foca.png" class="w-50 rounded mx-auto d-block">
-=======
     </div>
->>>>>>> ac450d6b074c59434f538a88b6166436bff55510
 </div>
-- 
1.9.1