Merge branch '2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran5' into 'develop'
Deleted constant See merge request artica/pandorafms!2057 Former-commit-id: 905cb2f761a8d93d7c2bf59cefb5a8b8a783b521
This commit is contained in:
commit
c669d35720
|
@ -485,8 +485,15 @@ define("OPTION_AGENT_AUTOCOMPLETE", 9);
|
|||
define("OPTION_SELECT_MULTISELECTION", 10);
|
||||
define("OPTION_COLOR_PICKER", 11);
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
define("DASHBOARD_WIDGET_ID_VISUAL_CONSOLE", 22);
|
||||
|
||||
=======
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
>>>>>>> Stashed changes
|
||||
/* Transactional map constants */
|
||||
define("NODE_TYPE", 0);
|
||||
define("ARROW_TYPE", 1);
|
||||
|
|
Loading…
Reference in New Issue