diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #24058 [FrameworkBundle] Fix Form conflict rule (chalasr)

Browse Source 
This PR was merged into the 3.4 branch.

Discussion
----------

[FrameworkBundle] Fix Form conflict rule

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Fixes https://travis-ci.org/symfony/symfony/jobs/270430600#L2628.
/cc @ogizanagi @yceruto

Commits
-------

e1f9ff6 [FrameworkBundle] Fix form conflict rule
This commit is contained in:
Nicolas Grekas 2017-09-01 13:44:30 +02:00
commit 042328dc52
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -65,7 +65,7 @@
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/asset": "<3.3",
"symfony/console": "<3.4",
"symfony/form": "<3.3",
"symfony/form": "<3.4",
"symfony/property-info": "<3.3",
"symfony/serializer": "<3.3",
"symfony/translation": "<3.4",