diff --git a/index.php b/index.php index 2f677d7..1f7fe9d 100644 --- a/index.php +++ b/index.php @@ -1314,10 +1314,17 @@ document.oncopy = addLink; echo " " ; } if(isset($_SESSION['id'] )) { +<<<<<<< HEAD $id_empresa_portada='1'; if($_SESSION['grupo'] == '3'){ echo "
  • $_SESSION[username] $_SESSION[equipo] Salir
  • "; +======= + $id_empresa_portada='1'; + if($_SESSION['grupo'] == '3'){ + + echo " ".panel_aplicaciones('1',"","")." "; +>>>>>>> 72f99f7549661d54a5285e87c304fb47afe11f76 } else{ $usuario = $_SESSION['username']; echo "
  • ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."
  • "; diff --git a/milfs b/milfs index 28c935e..eb0787f 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 28c935e11e9ef038d54860b6117454cb135ef005 +Subproject commit eb0787ff9224d2f880b35a43c6420c5d033919a1