qwerty/milfs
2
0
Fork 2
Code Issues 6 Pull Requests 1 Releases Wiki Activity

Correccion de error al hacer merge #23

Merged
humano merged 1 commits from kleper/milfskleper:master into master 2018-10-24 15:30:51 +00:00
Conversation 0 Commits 1 Files Changed 1 -9
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6e9a6cc1e - Show all commits

9
index.php
View File

@ -186,13 +186,8 @@ legend.legend-area {
</style>
</head>
<<<<<<< HEAD
<body >
<?php if($embebido ==1) {
=======
<body onload="revisarSession()"; >
<?php if($embebido ==1) {
>>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a
if($form!=''){ echo formulario_embebido($form,$opciones);}
elseif($identificador !='') { echo mostrar_identificador($identificador,$id);}
//elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;}
@ -316,9 +311,6 @@ $(document).ready(function() {
$('.wysiwyg_auto').summernote({dialogsInBody: true});
});
<<<<<<< HEAD
</script>
=======
</script>
<?php if(isset($_SESSION['id'])){ echo "
<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>
</div>
</form> "; } ?>
>>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a
</body>
</html>