summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/includes/pintaTablaConfiguraciones.php
diff options
context:
space:
mode:
authorRamón M. Gómez <ramongomez@us.es>2018-11-26 12:52:31 +0100
committerRamón M. Gómez <ramongomez@us.es>2018-11-26 12:52:31 +0100
commit51e67a2cc790796cf3e6832d430c4473e6377ed8 (patch)
tree41e24b0c7e74d95f55dcaca94f778f008774bb4f /admin/WebConsole/includes/pintaTablaConfiguraciones.php
parent910a4c358af0191b5c83f45f93a444b60a633fff (diff)
parent518d4d84f755185f224c82d5cc3f49b350af4b05 (diff)
#794: Fast-forward.
Diffstat (limited to 'admin/WebConsole/includes/pintaTablaConfiguraciones.php')
-rw-r--r--admin/WebConsole/includes/pintaTablaConfiguraciones.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/admin/WebConsole/includes/pintaTablaConfiguraciones.php b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
index 27e6fac4..ecf69574 100644
--- a/admin/WebConsole/includes/pintaTablaConfiguraciones.php
+++ b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
@@ -441,8 +441,6 @@ function tablaConfiguracionesCrearSoftIncremental($idordenador)
echo $tablaHtml;
return($tbPAR);
}
-<<<<<<< .mine
-/**/
// Devuelve un Array nombres de los sistemas operativos en BD con sus identificadores.