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

pull milfs conflictos

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

7
index.php
View File

@ -1314,10 +1314,17 @@ document.oncopy = addLink;
echo " " ; echo " " ;
} }
if(isset($_SESSION['id'] )) { if(isset($_SESSION['id'] )) {
<<<<<<< HEAD
$id_empresa_portada='1'; $id_empresa_portada='1';
if($_SESSION['grupo'] == '3'){ 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'> 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>"; <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']; else{ $usuario = $_SESSION['username'];
echo " <li style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." </li>"; echo " <li style=' $no_mostrar '>".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." </li>";

2
milfs

@ -1 +1 @@
Subproject commit 28c935e11e9ef038d54860b6117454cb135ef005 Subproject commit eb0787ff9224d2f880b35a43c6420c5d033919a1