From 3ecfb851d5f74068c73a7688a3db4505710b2a9c Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Wed, 13 Aug 2014 15:40:01 -0400
Subject: [PATCH] Fixing my bad merge conflict resolution

---
 reference/forms/types/number.rst | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst
index f44b48be514..76493b8fa2b 100644
--- 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.