From b6e9a6cc1e9be0b4f34b1e8ea55c6c9a6874e922 Mon Sep 17 00:00:00 2001 From: kleper Date: Wed, 24 Oct 2018 10:29:06 -0500 Subject: [PATCH] Correccion de error de merge --- index.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/index.php b/index.php index 19ad215..d8d6ead 100644 --- a/index.php +++ b/index.php @@ -186,13 +186,8 @@ legend.legend-area { -<<<<<<< HEAD - - >>>>>> 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 - -======= @@ -327,6 +319,5 @@ $(document).ready(function() { Reload "; } ?> ->>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a -- 2.30.2