From 0142691cfe1f950a3a6de65606977b735bb03788 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sat, 21 Apr 2018 13:35:32 -0500
Subject: [PATCH] fetch con directorio remoto corriguiendo conflicto

---
 index.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 456525e..6504653 100644
--- a/index.php
+++ b/index.php
@@ -1361,13 +1361,10 @@ echo $css_adicional;
 						  
                    <div class="col-md-9">
                     <div id='formulario_login' class='' ></div>
-<<<<<<< HEAD
-                    <div class='container' div='contenedor_cabecera'>
-						<div class='col-md-3' id='logo_cabecera'>
-=======
+
                     <div class='container' id='contenedor_cabecera'>
 						<div class='col-sm-12 col-md-3' id='logo_cabecera'>
->>>>>>> 8eca1b220dbaecbb61b41974573b70a4d8ee8bea
+							
 							<a href="./e<?php echo $id_empresa; ?>">
 								<img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>">
 							</a>