Commit b8089d1a authored by catch's avatar catch
Browse files

Issue #3526117 by phenaproxima: Conflict with Project Browser <2.1 and Automatic Updates <4

parent c15eed32

composer.lock

+3 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "3806cfdbb344a5c7ed6e8b78534454547ccd882a"

                "reference": "9a3b93d8f495d3f101bcc2d39ce91695b57aece6"

            },

            "require": {

                "asm89/stack-cors": "^2.3",
@@ -550,6 +550,8 @@ 
                "twig/twig": "^3.21.0"

            },

            "conflict": {

                "drupal/automatic_updates": "<4",

                "drupal/project_browser": "<2.1",

                "drush/drush": "<12.4.3"

            },

            "replace": {

core/composer.json

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 
        "php-tuf/composer-stager": "^2.0"

    },

    "conflict": {

        "drupal/automatic_updates": "<4",

        "drupal/project_browser": "<2.1",

        "drush/drush": "<12.4.3"

    },

    "replace": {