Merge pull request #1178 from dpfaffenbauer/monolog

[Tests] add conflict for monolog
coreshop · Nov 18, 2019 · 10cd7da · 10cd7da
2 parents c3087d8 + 58ec91e
commit 10cd7da
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -109,7 +109,8 @@
     "phpstan/phpstan-webmozart-assert": "^0.10"
   },
   "conflict": {
-    "pimcore/pimcore": "5.7.0 || 5.7.1"
+    "pimcore/pimcore": "5.7.0 || 5.7.1",
+    "monolog/monolog": ">=2"
   },
   "autoload": {
     "psr-4": {