Verified Commit 961cc15c authored by Dave Long's avatar Dave Long
Browse files

Issue #3402955 by quietone, Spokje: Update drush conflict to "<12.4.3"

parent 6332d42f

composer.lock

+2 −2
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "93190a646897bad52a0ef4db3bc48e8fd434bc68"

                "reference": "967ffef6237c9d04df7b1ddbc5a8ef1137d46e39"

            },

            "require": {

                "asm89/stack-cors": "^2.1",
@@ -543,7 +543,7 @@ 
                "twig/twig": "^3.5.0"

            },

            "conflict": {

                "drush/drush": "<8.1.10"

                "drush/drush": "<12.4.3"

            },

            "replace": {

                "drupal/core-annotation": "self.version",

core/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        "sebastian/diff": "^4"

    },

    "conflict": {

        "drush/drush": "<8.1.10"

        "drush/drush": "<12.4.3"

    },

    "replace": {

        "drupal/core-annotation": "self.version",