From 4e026c729328fd3a63892e398fbfad171c6de75f Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 2 Jan 2018 17:59:36 +0100 Subject: [PATCH] Fixed a merge error --- service_container/3.3-di-changes.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst index 8942a94ed8d..09c8ee3c26a 100644 --- a/service_container/3.3-di-changes.rst +++ b/service_container/3.3-di-changes.rst @@ -626,13 +626,8 @@ Start by updating the service ids to class names: Services associated with global PHP classes (i.e. not using PHP namespaces) must maintain the ``class`` parameter. For example, when using the old Twig -<<<<<<< HEAD - classes (e.g. ``Twig_Extensions_Extension_Intl`` instead of ``Twig\Extensions\IntlExtension``) - you can't redefine the service as `Twig_Extensions_Extension_Intl: ~` and -======= classes (e.g. ``Twig_Extensions_Extension_Intl`` instead of ``Twig\Extensions\IntlExtension``),   you can't redefine the service as ``Twig_Extensions_Extension_Intl: ~`` and ->>>>>>> upstream/3.3 you must keep the original ``class`` parameter. But, this change will break our app! The old service ids (e.g. ``app.github_notifier``)