Merge branch '4.2'

javiereguiluz · javiereguiluz · commit 7ca5809c92a2 · 2019-04-12T16:23:45.000+02:00
* 4.2:
  Fixed a bad merge
diff --git a/doctrine.rst b/doctrine.rst
@@ -170,13 +170,6 @@ Woh! You now have a new ``src/Entity/Product.php`` file::
     column with default value NULL*. Add a ``nullable=true`` option to the
     ``description`` property to fix the problem.
 
-.. note::
-
-    A bundle can accept only one metadata definition format. For example, it's
-    not possible to mix YAML metadata definitions with annotated PHP entity
-    class definitions.
->>>>>>> 3.4
-
 .. caution::
 
     There is a `limit of 767 bytes for the index key prefix`_ when using
