From 41c7059e6d5f5be3590672d8cd9b0f8f1400e9e8 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 28 Jul 2015 17:38:33 +0200 Subject: [PATCH] Fixed another merge conflict --- components/event_dispatcher/introduction.rst | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst index e1d2bc0d9a4..23bb2ab3193 100644 --- a/components/event_dispatcher/introduction.rst +++ b/components/event_dispatcher/introduction.rst @@ -632,13 +632,8 @@ Event Name Introspection Before Symfony 2.4, the event name and the event dispatcher had to be requested from the ``Event`` instance. These methods are now deprecated. -<<<<<<< HEAD -The ``EventDispatcher`` instance, as well as the name of the event that is -dispatched, are passed as arguments to the listener:: -======= -The event name, (as with any other data in a custom event object) can be -used as part of the listener's processing logic:: ->>>>>>> 2.3 +The ``EventDispatcher`` instance, as well as the name of the event that +is dispatched, are passed as arguments to the listener:: use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\EventDispatcherInterface;