Commitd0ca865

committed

Merge branch '2.4' into 2.5

* 2.4: Fixing my bad merge conflict resolution

2 parentsf40bb24 +3ecfb85 commitd0ca865Copy full SHA for d0ca865

File tree

-7

lines changed

-7

lines changed

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,16 +45,9 @@ rounding_mode`
`45`	`45`
`46`	`46`	If a submitted number needs to be rounded (based on the ``precision``
`47`	`47`	`option), you have several configurable options for that rounding. Each`
`48`		`-<<<<<<< HEAD`
`49`	`48`	option is a constant on the:class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\NumberToLocalizedStringTransformer`:
`50`	`49`
`51`	`50`	* ``NumberToLocalizedStringTransformer::ROUND_DOWN`` Round towards zero.
`52`		`-=======`
`53`		-option is a constant on the:class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
`54`		`-`
`55`		-* ``IntegerToLocalizedStringTransformer::ROUND_DOWN`` Rounding mode to
`56`		`- round towards zero.`
`57`		`->>>>>>> 2.3`
`58`	`51`
`59`	`52`	* ``NumberToLocalizedStringTransformer::ROUND_FLOOR`` Round towards negative
`60`	`53`	`infinity.`

Comments

(0)