Merge branch '2.4' into 2.5

* 2.4: Fixing my bad merge conflict resolution
symfony · Aug 13, 2014 · d0ca865 · d0ca865
2 parents f40bb24 + 3ecfb85
commit d0ca865
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst
@@ -45,16 +45,9 @@ rounding_mode
 
 If a submitted number needs to be rounded (based on the ``precision``
 option), you have several configurable options for that rounding. Each
-<<<<<<< HEAD
 option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\NumberToLocalizedStringTransformer`:
 
 * ``NumberToLocalizedStringTransformer::ROUND_DOWN`` Round towards zero.
-=======
-option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
-
-*   ``IntegerToLocalizedStringTransformer::ROUND_DOWN`` Rounding mode to
-    round towards zero.
->>>>>>> 2.3
 
 * ``NumberToLocalizedStringTransformer::ROUND_FLOOR`` Round towards negative
   infinity.