8000 Merge branch '3.4' into 4.3 · symfony/symfony@5188215 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5188215

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.3
* 3.4: Add conflict rule for Monolog 2.
2 parents 479efc5 + 829ced8 commit 5188215

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
},
122122
"conflict": {
123123
"masterminds/html5": "<2.6",
124+
"monolog/monolog": ">=2",
124125
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
125126
"phpdocumentor/type-resolver": "<0.3.0",
126127
"ocramius/proxy-manager": "<2.1",

0 commit comments

Comments
 (0)
0