Added the "payload" option back (was removed by mistake)

javiereguiluz · weaverryan · commit f13625b22a89 · 2015-07-07T18:53:51.000-04:00
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst
@@ -8,6 +8,11 @@ Validates that a value is a valid URL string.
 +----------------+---------------------------------------------------------------------+
 | Options        | - `message`_                                                        |
 |                | - `protocols`_                                                      |
+<<<<<<< HEAD
+=======
+|                | - `payload`_                                                        |
+|                | - `checkDNS`_                                                       |
+>>>>>>> Added the "payload" option back (was removed by mistake)
 +----------------+---------------------------------------------------------------------+
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Url`            |
 +----------------+---------------------------------------------------------------------+
