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 "
";
-=======
- $id_empresa_portada='1';
- if($_SESSION['grupo'] == '3'){
-
+
echo " ".panel_aplicaciones('1',"","")." ";
->>>>>>> 72f99f7549661d54a5285e87c304fb47afe11f76
}
else{ $usuario = $_SESSION['username'];
echo " ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." ";