From c42d0f2209078fa320c0f31f0e3b4c484345de58 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 10 Oct 2018 22:22:34 -0500
Subject: [PATCH] pull y push mess

---
 index.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/index.php b/index.php
index 1f7fe9d..6c19f4e 100644
--- a/index.php
+++ b/index.php
@@ -1314,17 +1314,10 @@ document.oncopy = addLink;
    echo " " ;
 }
   	if(isset($_SESSION['id'] )) {
-<<<<<<< HEAD
 		$id_empresa_portada='1';
 		if($_SESSION['grupo'] == '3'){
-			echo "<li style=' $no_mostrar '><div style='max-width:100%;' class='container-fluid noprint text-center $no_mostrar ' id='cabecera-botonera-admin'>
-				<a class='' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='fa fa-times '></i></a></div></li>";
-=======
-		$id_empresa_portada='1'; 
-		if($_SESSION['grupo'] == '3'){ 
-			
+
 				echo "		<span style=' $no_mostrar '>".panel_aplicaciones('1',"","")." </span>"; 
->>>>>>> 72f99f7549661d54a5285e87c304fb47afe11f76
 			}
 		else{				$usuario = $_SESSION['username'];
 			echo "		<li style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." </li>";