diff options
| author | albertogp <albertogp@uma.es> | 2021-05-03 17:10:17 +0200 |
|---|---|---|
| committer | albertogp <albertogp@uma.es> | 2021-05-03 17:10:17 +0200 |
| commit | f3f00f104cb9aaf0331fab5d6adcb63e1ecc6f6b (patch) | |
| tree | 001f38367eee26cfa5c2fe34e9ba4605abcf3b9b | |
| parent | 016c5232d5c44e28e5748bba76cec496491a31c9 (diff) | |
| parent | ad404a75612b5101f72cafb6ab2a1b62bf7b9d5e (diff) | |
#824 Integrando rama
| -rw-r--r-- | admin/WebConsole/comandos/gestores/gestor_Comandos.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/WebConsole/comandos/gestores/gestor_Comandos.php b/admin/WebConsole/comandos/gestores/gestor_Comandos.php index e7599333..95b81799 100644 --- a/admin/WebConsole/comandos/gestores/gestor_Comandos.php +++ b/admin/WebConsole/comandos/gestores/gestor_Comandos.php @@ -239,6 +239,7 @@ if($sw_ejya=='on'){ ################################################################### +<<<<<<< HEAD ################################################################### ///////////////////// agp /////////////////////////////////////// ################################################################### @@ -302,6 +303,8 @@ if($sw_ejya=='on'){ ################################################################### +======= +>>>>>>> ad404a75612b5101f72cafb6ab2a1b62bf7b9d5e /*-------------------------------------------------------------------------------------------------------------------- Creación de parametros para sentencias SQL --------------------------------------------------------------------------------------------------------------------*/ |