summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole
diff options
context:
space:
mode:
authoralbertogp <albertogp@uma.es>2021-05-03 17:12:26 +0200
committeralbertogp <albertogp@uma.es>2021-05-03 17:12:26 +0200
commit257195ea1832ef68486f94bc9255e10b9cf8a15e (patch)
treed6a79ea9fef5f7bf669d37fac77cdb2b3e548a7c /admin/WebConsole
parent2aaa6a0df919a382b8fed5992cd59ede77c7f210 (diff)
parentf3f00f104cb9aaf0331fab5d6adcb63e1ecc6f6b (diff)
#824 Integrando rama
Diffstat (limited to 'admin/WebConsole')
-rw-r--r--admin/WebConsole/comandos/gestores/gestor_Comandos.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/admin/WebConsole/comandos/gestores/gestor_Comandos.php b/admin/WebConsole/comandos/gestores/gestor_Comandos.php
index 4d42fca8..4a3b6f4d 100644
--- a/admin/WebConsole/comandos/gestores/gestor_Comandos.php
+++ b/admin/WebConsole/comandos/gestores/gestor_Comandos.php
@@ -239,6 +239,10 @@ if($sw_ejya=='on'){
###################################################################
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> f3f00f104cb9aaf0331fab5d6adcb63e1ecc6f6b
###################################################################
///////////////////// agp ///////////////////////////////////////
###################################################################
@@ -302,6 +306,7 @@ if($sw_ejya=='on'){
###################################################################
+<<<<<<< HEAD
###################################################################
///////////////////// agp ///////////////////////////////////////
###################################################################
@@ -428,6 +433,10 @@ if($sw_ejya=='on'){
###################################################################
+=======
+=======
+>>>>>>> ad404a75612b5101f72cafb6ab2a1b62bf7b9d5e
+>>>>>>> f3f00f104cb9aaf0331fab5d6adcb63e1ecc6f6b
/*--------------------------------------------------------------------------------------------------------------------
Creación de parametros para sentencias SQL
--------------------------------------------------------------------------------------------------------------------*/