Fix conflict

studiometa · Mar 28, 2024 · 93839b1 · 93839b1
1 parent 009bac7
commit 93839b1
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 55 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
   "require": {
     "php": "^8.1",
     "monolog/monolog": "^2.9|^3.0",
-    "psr/log": "^1.1",
+    "psr/log": "^1.1|^2.0|^3.0",
     "sentry/sentry": "^4.6",
     "studiometa/webpack-config": "^5.0",
     "symfony/http-foundation": "^6.4|^7.0",

diff --git a/composer.lock b/composer.lock