qwerty/tupali
4
1
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

pull y push mess

Browse Source
This commit is contained in:
Hacky Purple 2018-10-10 22:22:34 -05:00
parent fe54dbd50f
commit c42d0f2209
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
index.php
View File

@ -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>";