mirror of
https://github.com/symfony/recipes.git
synced 2026-03-23 23:32:10 +01:00
Merge pull request #1056 from symfony/conflicts
Conflict with fwb < 5.3 when@env
This commit is contained in:
@@ -44,5 +44,8 @@
|
||||
" - \"5432\""
|
||||
]
|
||||
}
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/framework-bundle": "<5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,5 +2,8 @@
|
||||
"copy-from-recipe": {
|
||||
"config/": "%CONFIG_DIR%/"
|
||||
},
|
||||
"aliases": ["router"]
|
||||
"aliases": ["router"],
|
||||
"conflict": {
|
||||
"symfony/framework-bundle": "<5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,5 +2,8 @@
|
||||
"copy-from-recipe": {
|
||||
"config/": "%CONFIG_DIR%/"
|
||||
},
|
||||
"aliases": ["router"]
|
||||
"aliases": ["router"],
|
||||
"conflict": {
|
||||
"symfony/framework-bundle": "<5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,5 +5,8 @@
|
||||
"copy-from-recipe": {
|
||||
"config/": "%CONFIG_DIR%/"
|
||||
},
|
||||
"aliases": ["security"]
|
||||
"aliases": ["security"],
|
||||
"conflict": {
|
||||
"symfony/framework-bundle": "<5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,5 +5,8 @@
|
||||
"copy-from-recipe": {
|
||||
"config/": "%CONFIG_DIR%/",
|
||||
"templates/": "templates/"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/framework-bundle": "<5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,5 +5,8 @@
|
||||
"copy-from-recipe": {
|
||||
"config/": "%CONFIG_DIR%/",
|
||||
"templates/": "templates/"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/framework-bundle": "<5.3"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user