8000 minor #33030 [Console] add missing conflict rule (xabbuh) · fabpot/symfony@c61b4f2 · GitHub
[go: up one dir, main page]
Skip to content

Commit c61b4f2

Browse files
nicolas-grekasnicolas-grekas
committed
minor symfony#33030 [Console] add missing conflict rule (xabbuh)
This PR was merged into the 4.4 branch. Discussion ---------- [Console] add missing conflict rule | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The LockableTrait uses the LockFactory introduced in Symfony 4.4. Commits ------- a63df9c add missing conflict rule
2 parents c2a3321 + a63df9c commit c61b4f2

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎src/Symfony/Component/Console/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"conflict": {
4343
"symfony/dependency-injection": "<3.4",
4444
"symfony/event-dispatcher": "<4.3|>=5",
45+
"symfony/lock": "<4.4",
4546
"symfony/process": "<3.3"
4647
},
4748
"autoload": {

0 commit comments

Comments
 (0)
0