humano/milfs
1
0
Fork 0
forked from qwerty/milfs
Code Issues Pull Requests Releases Wiki Activity

Correccion de error de merge

Browse Source
This commit is contained in:
kleper 2018-10-24 10:29:06 -05:00
parent cec188c1da
commit b6e9a6cc1e
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
index.php
View File

@ -186,13 +186,8 @@ legend.legend-area {
</style> </style>
</head> </head>
<<<<<<< HEAD
<body >
<?php if($embebido ==1) {
=======
<body onload="revisarSession()"; > <body onload="revisarSession()"; >
<?php if($embebido ==1) { <?php if($embebido ==1) {
>>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a
if($form!=''){ echo formulario_embebido($form,$opciones);} if($form!=''){ echo formulario_embebido($form,$opciones);}
elseif($identificador !='') { echo mostrar_identificador($identificador,$id);} elseif($identificador !='') { echo mostrar_identificador($identificador,$id);}
//elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;} //elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;}
@ -316,9 +311,6 @@ $(document).ready(function() {
$('.wysiwyg_auto').summernote({dialogsInBody: true}); $('.wysiwyg_auto').summernote({dialogsInBody: true});
}); });
<<<<<<< HEAD
</script>
=======
</script> </script>
<?php if(isset($_SESSION['id'])){ echo " <?php if(isset($_SESSION['id'])){ echo "
<form name='form_session' class='navbar-form navbar-left'> <form name='form_session' class='navbar-form navbar-left'>
@ -327,6 +319,5 @@ $(document).ready(function() {
<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span> <span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span>
</div> </div>
</form> "; } ?> </form> "; } ?>
>>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a
</body> </body>
</html> </html>