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

Commit 34bb84b

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.0
* 3.4: [SecurityBundle] update conflict rule
2 parents a313a8f + 531fcac commit 34bb84b
< 8000 div class="prc-PageLayout-PageLayoutContent-jzDMn">

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"twig/twig": "~1.34|~2.4"
4545
},
4646
"conflict": {
47-
"symfony/security": "4.1.0-beta1",
47+
"symfony/security": "4.1.0-beta1,4.1.0-beta2",
4848
"symfony/var-dumper": "<3.4",
4949
"symfony/event-dispatcher": "<3.4",
5050
"symfony/framework-bundle": "<3.4",

0 commit comments

Comments
 (0)
0