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

2234 los titulos de los dashboards publicos no se muestran5

See merge request artica/pandorafms!2059

Former-commit-id: 8997749d37dd87519b90ff60df482111e8862fb9

pandora_console/include/constants.php

@@ -485,15 +485,6 @@ 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);