Merge branch '4.2'

javiereguiluz · javiereguiluz · commit 3c9b76323221 · 2019-04-12T16:09:06.000+02:00
* 4.2:
  Fixed a bad merge
diff --git a/controller.rst b/controller.rst
@@ -185,18 +185,8 @@ Templating and Twig are explained more in the
 .. _controller-accessing-services:
 .. _accessing-other-services:
 
-<<<<<<< HEAD
 Fetching Services
 ~~~~~~~~~~~~~~~~~
-=======
-Fetching Services as Controller Arguments
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 3.3
-
-    The ability to type-hint a controller argument in order to receive a service
-    was introduced in Symfony 3.3.
->>>>>>> 3.4
 
 Symfony comes *packed* with a lot of useful objects, called :doc:`services </service_container>`.
 These are used for rendering templates, sending emails, querying the database and
