summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/includes/pintaTablaConfiguraciones.php
diff options
context:
space:
mode:
authorRamón M. Gómez <ramongomez@us.es>2019-10-01 09:26:19 +0200
committerRamón M. Gómez <ramongomez@us.es>2019-10-01 09:26:19 +0200
commitf66e791fa44de4f2ea7b572503d8128b6b543386 (patch)
tree88f3cc52d69aebfc23ed67e3c21b33288af7deaa /admin/WebConsole/includes/pintaTablaConfiguraciones.php
parent8256de50847692558d12bda5647ea3ec71c0a22b (diff)
parent51e67a2cc790796cf3e6832d430c4473e6377ed8 (diff)
#794: Fast-forwardpjlink
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 6491856e..5a0b72ae 100644
--- a/admin/WebConsole/includes/pintaTablaConfiguraciones.php
+++ b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
@@ -439,8 +439,6 @@ function tablaConfiguracionesCrearSoftIncremental($idordenador)
echo $tablaHtml;
return($tbPAR);
}
-<<<<<<< .mine
-/**/
// Devuelve un Array nombres de los sistemas operativos en BD con sus identificadores.