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

Fix leftover conflict marker in UPGRADE-3.0.md

This commit is contained in:
Guilliam Xavier 2016-03-14 22:24:56 +01:00
parent 28500db930
commit b47220aaa4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UPGRADE-3.0.md
View File

@ -403,7 +403,6 @@ UPGRADE FROM 2.x to 3.0
* The `choice_list` option of `ChoiceType` was removed.
>>>>>>> 2.8
* The option "precision" was renamed to "scale".
Before: