diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2019-10-01 09:58:01 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2019-10-01 09:58:01 +0200 |
| commit | 3dc1388b96e419c2c5114eee007fb6de99f239e9 (patch) | |
| tree | e567729d8a8489b7e9b43317a326181918489e5f | |
| parent | 49584c53ecc995f048d52b5863c5ac940864c810 (diff) | |
| parent | edf07e216c017afe99e464adcf18613035692448 (diff) | |
#812: Fast-forward branch.
| -rw-r--r-- | admin/WebConsole/comandos/IniciarSesion.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/admin/WebConsole/comandos/IniciarSesion.php b/admin/WebConsole/comandos/IniciarSesion.php index 873d3791..78f898b2 100644 --- a/admin/WebConsole/comandos/IniciarSesion.php +++ b/admin/WebConsole/comandos/IniciarSesion.php @@ -58,14 +58,11 @@ if (!$cmd) RecopilaIpesMacs($cmd,$ambito,$idambito); ?> -<<<<<<< HEAD <P align=center><SPAN class=subcabeceras><?php echo $TbMsg[7] ?></SPAN></P> <BR> -======= <P align=center> <SPAN align=center class=subcabeceras><?php echo $TbMsg[7] ?></SPAN> <br> ->>>>>>> #812: Usar fichero de configuración JSON en comandos Configurar e Iniciar Sesión. <form align=center name="fdatos" method="POST"> <INPUT type="hidden" name="idambito" value="<?php echo $idambito?>"> <INPUT type="hidden" name="ambito" value="<?php echo $ambito?>"> @@ -141,7 +138,6 @@ function tabla_configuraciones($cmd,$idordenador){ ORDER BY ordenadores_particiones.numpar"; $rs=new Recordset; $rs->Comando=&$cmd; - $rs->Comando=&$cmd; if (!$rs->Abrir()) return($tablaHtml); // Error al abrir recordset $rs->Primero(); while (!$rs->EOF){ |