From 3ae3244b8cf7693a1998a6cc4d114b48a1e40244 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 17 Mar 2020 10:54:35 +0100 Subject: [PATCH] fix merge --- .../Functional/Bundle/TestBundle/Resources/config/routing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml index d9c7986f42..155871fc27 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml @@ -20,7 +20,7 @@ session_setflash: injected_flashbag_session_setflash: path: injected_flashbag/session_setflash/{message} - defaults: { _controller: TestBundle:InjectedFlashbagSession:setFlash} + defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\InjectedFlashbagSessionController::setFlashAction} session_showflash: path: /session_showflash