Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cb1aaf5

Browse files
committed
update conflict rules
1 parent fdf6320 commit cb1aaf5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Symfony/Component/Form/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"symfony/error-handler": "<5.4",
5151
"symfony/framework-bundle": "<5.4",
5252
"symfony/http-kernel": "<5.4",
53-
"symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3",
53+
"symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3",
5454
"symfony/translation-contracts": "<2.5",
5555
"symfony/twig-bridge": "<6.3"
5656
},

src/Symfony/Component/Security/Core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"symfony/http-foundation": "<5.4",
4141
"symfony/security-guard": "<5.4",
4242
"symfony/ldap": "<5.4",
43-
"symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3",
43+
"symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3",
4444
"symfony/validator": "<5.4"
4545
},
4646
"autoload": {

src/Symfony/Component/Validator/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"symfony/http-kernel": "<5.4",
5151
"symfony/intl": "<5.4",
5252
"symfony/property-info": "<5.4",
53-
"symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3",
53+
"symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3",
5454
"symfony/yaml": "<5.4"
5555
},
5656
"autoload": {

0 commit comments

Comments
 (0)