diff --git a/index.php b/index.php index 6f28724..a059198 100644 --- a/index.php +++ b/index.php @@ -1,8 +1,6 @@ +<<<<<<< HEAD "; + if($vista_favorita[0] !=""){ $variable = $vista_favorita;//"e".$_REQUEST['empresa']; } + } } $v = decodifica_parametro($variable); @@ -709,6 +714,7 @@ if('serviceWorker' in navigator) { $footer=" +<<<<<<< HEAD "; +======= + "; +>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861 @@ -1412,7 +1444,13 @@ document.oncopy = addLink; - + --> -