summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole
diff options
context:
space:
mode:
Diffstat (limited to 'admin/WebConsole')
-rw-r--r--admin/WebConsole/comandos/IniciarSesion.php4
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){