From aafdde1e1367fcea0d47749390d2fb335a61114c Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 24 May 2023 14:27:33 +1200 Subject: [PATCH] MNT Fix broken merge-up --- composer.json | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/composer.json b/composer.json index 700917a2f50..62338326ea1 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "sake" ], "require": { -<<<<<<< HEAD "php": "^8.1", "composer/installers": "^2.2", "guzzlehttp/guzzle": "^7.5.0", @@ -34,6 +33,7 @@ "monolog/monolog": "^3.2.0", "nikic/php-parser": "^4.15.0", "psr/container": "^1.1 || ^2.0", + "psr/http-message": "^1", "sebastian/diff": "^4.0", "silverstripe/config": "^2", "silverstripe/assets": "^2", @@ -47,31 +47,6 @@ "symfony/mime": "^6.1", "symfony/translation": "^6.1", "symfony/yaml": "^6.1", -======= - "bramus/monolog-colored-line-formatter": "^2", - "composer/installers": "^1 || ^2", - "composer/semver": "^1 || ^3", - "guzzlehttp/guzzle": "^7", - "guzzlehttp/psr7": "^2", - "embed/embed": "^4", - "league/csv": "^8 || ^9", - "m1/env": "^2.1", - "monolog/monolog": "^1.16", - "nikic/php-parser": "^4.10.5", - "psr/container": "^1", - "psr/http-message": "^1", - "silverstripe/config": "^1@dev", - "silverstripe/assets": "^1@dev", - "silverstripe/vendor-plugin": "^1.6", - "sminnee/callbacklist": "^0.1", - "swiftmailer/swiftmailer": "^6.2", - "symfony/cache": "^3.4 || ^4.0", - "symfony/config": "^3.4 || ^4.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/translation": "^3.4 || ^4.0", - "symfony/yaml": "^3.4 || ^4.0", - "php": "^7.4 || ^8.0", ->>>>>>> 4 "ext-ctype": "*", "ext-dom": "*", "ext-hash": "*",