summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/includes/pintaTablaConfiguraciones.php
diff options
context:
space:
mode:
authorjalonso <jonathan.alonso@uab.es>2013-06-13 10:26:53 +0000
committerjalonso <jonathan.alonso@uab.es>2013-06-13 10:26:53 +0000
commit313ec31147ef3b0e94440b0e61bc9f09bb54d472 (patch)
tree4faf26b393378a2e4a28d41c1629d80ef9743528 /admin/WebConsole/includes/pintaTablaConfiguraciones.php
parentb5bc6b2361d35d49884e5468cd35e18fffe6c9ea (diff)
Errores de codigo, solo faltaba un punto y coma y habia restos de codigo que no debian de estar.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@3879 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/includes/pintaTablaConfiguraciones.php')
-rw-r--r--admin/WebConsole/includes/pintaTablaConfiguraciones.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/admin/WebConsole/includes/pintaTablaConfiguraciones.php b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
index 6bcc0ab4..7804426f 100644
--- a/admin/WebConsole/includes/pintaTablaConfiguraciones.php
+++ b/admin/WebConsole/includes/pintaTablaConfiguraciones.php
@@ -335,6 +335,4 @@ function tablaConfiguracionesCrearSoftIncremental($idordenador)
}
<<<<<<< .mine
/**/
-=======
-/**/
->>>>>>> .r3872
+