From 33065a3bdbeca01bff44cbd1b045c5f92354b583 Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Mon, 10 Dec 2018 13:49:18 +0100 Subject: [PATCH 1/3] Deleted constant Former-commit-id: ce3130ce63d9aa75986fc56161aff6964232e49d --- pandora_console/include/constants.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 07979103c8..449c131d57 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -485,15 +485,7 @@ 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); From 49ce00860fa7bcb7f9014aa63460445a9ed9afa3 Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Mon, 10 Dec 2018 14:18:56 +0100 Subject: [PATCH 2/3] Deleted constant2 Former-commit-id: 7984c71e2f0ae82ade917d19c16788e037b176de --- pandora_console/include/constants.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 449c131d57..7ce0d2df69 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -485,6 +485,7 @@ define("OPTION_AGENT_AUTOCOMPLETE", 9); define("OPTION_SELECT_MULTISELECTION", 10); define("OPTION_COLOR_PICKER", 11); +define("DASHBOARD_WIDGET_ID_VISUAL_CONSOLE", 22); /* Transactional map constants */ define("NODE_TYPE", 0); From 7667c73a382d2308cbb041987b3fdd0daaee3f59 Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Mon, 10 Dec 2018 14:23:23 +0100 Subject: [PATCH 3/3] Deleted constatn Former-commit-id: 880a81ca75686569b16fd362a102364343bc15af --- pandora_console/include/constants.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 7ce0d2df69..c223738b2a 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -485,8 +485,6 @@ define("OPTION_AGENT_AUTOCOMPLETE", 9); define("OPTION_SELECT_MULTISELECTION", 10); define("OPTION_COLOR_PICKER", 11); -define("DASHBOARD_WIDGET_ID_VISUAL_CONSOLE", 22); - /* Transactional map constants */ define("NODE_TYPE", 0); define("ARROW_TYPE", 1);