tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5' into 'develop'

Browse Source 
2234 los titulos de los dashboards publicos no se muestran5

See merge request artica/pandorafms!2059

Former-commit-id: 8997749d37dd87519b90ff60df482111e8862fb9
This commit is contained in:
vgilc 2018-12-10 14:39:24 +01:00
commit 8419ada94c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/constants.php
View File

@ -485,15 +485,6 @@ define("OPTION_AGENT_AUTOCOMPLETE", 9);
define("OPTION_SELECT_MULTISELECTION", 10); define("OPTION_SELECT_MULTISELECTION", 10);
define("OPTION_COLOR_PICKER", 11); define("OPTION_COLOR_PICKER", 11);
<<<<<<< Updated upstream
define("DASHBOARD_WIDGET_ID_VISUAL_CONSOLE", 22);
=======
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
>>>>>>> Stashed changes
/* Transactional map constants */ /* Transactional map constants */
define("NODE_TYPE", 0); define("NODE_TYPE", 0);
define("ARROW_TYPE", 1); define("ARROW_TYPE", 1);