diff --git a/composer.json b/composer.json index 26d11b9262d..415c65276d0 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,9 @@ "macopedia/phpstan-magento1": "^1.0.4", "phpstan/phpstan": "^1.8" }, + "conflict": { + "n98/n98_layouthelper": "*" + }, "authors": [ { "name": "Lee Saferite", diff --git a/composer.lock b/composer.lock index bd88c14120e..67fca161c56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "41b19faf78fd7832d437d8c94c9cb252", + "content-hash": "ab93d8594c177fde90bd1611fb18162c", "packages": [ { "name": "eloquent/enumeration",