Projects >> mes >>cdab6986e6cacfa34a11c71f748ff4c5a9a6b59c

Chunk
Conflicting content
        addMenuViewDefinitionItem("operations", "products.menu.products.operations", menuCategoryProducts, operationGridView, 5);
        addMenuViewDefinitionItem("workPlans", "products.menu.products.workPlans", menuCategoryProducts, workPlanGridView, 6);

<<<<<<< HEAD
        if (!SystemProperties.getEnviroment().equals(SystemProperties.env.AMAZON)) {
            addMenuViewDefinitionItem("users", "users.menu.administration.users", menuCategoryAdministration, userGridView, 1);
            addMenuViewDefinitionItem("groups", "users.menu.administration.groups", menuCategoryAdministration, groupGridView, 2);
=======
        addMenuViewDefinitionItem("dictionaries", "dictionaries.menu.administration.dictionaries", menuCategoryAdministration,
                dictionaryGridView, 1);
        if (addAdministrationMenuToDatabase) {
            addMenuViewDefinitionItem("users", "users.menu.administration.users", menuCategoryAdministration, userGridView, 2);
            addMenuViewDefinitionItem("groups", "users.menu.administration.groups", menuCategoryAdministration, groupGridView, 3);
>>>>>>> cde96ec1d8add6a569e538ff0079d8ba40d67055
            addMenuViewDefinitionItem("plugins", "plugins.menu.administration.plugins", menuCategoryAdministration,
                    pluginGridView, 3);
            addMenuViewDefinitionItem("menu", "menu.menu.administration.menu", menuCategoryAdministration, menuCategoryGridView,
Solution content
        addMenuViewDefinitionItem("operations", "products.menu.products.operations", menuCategoryProducts, operationGridView, 5);
        addMenuViewDefinitionItem("workPlans", "products.menu.products.workPlans", menuCategoryProducts, workPlanGridView, 6);

        if (addAdministrationMenuToDatabase) {
            addMenuViewDefinitionItem("users", "users.menu.administration.users", menuCategoryAdministration, userGridView, 2);
            addMenuViewDefinitionItem("groups", "users.menu.administration.groups", menuCategoryAdministration, groupGridView, 3);
            addMenuViewDefinitionItem("plugins", "plugins.menu.administration.plugins", menuCategoryAdministration,
                    pluginGridView, 3);
            addMenuViewDefinitionItem("menu", "menu.menu.administration.menu", menuCategoryAdministration, menuCategoryGridView,
File
DatabasePreparationService.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation