From 6e0818db167a16ddcc91df18f2489d2fd8d3774c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 15 Jun 2018 10:15:34 +0200 Subject: [PATCH] fix merge --- .../Tests/DependencyInjection/SecurityExtensionTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php index 101e718f62..0a92a5877c 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php @@ -136,13 +136,11 @@ class SecurityExtensionTest extends TestCase 'some_firewall' => array( 'pattern' => '^/admin', 'http_basic' => null, - 'logout_on_user_change' => true, ), 'stateless_firewall' => array( 'pattern' => '/.*', 'stateless' => true, 'http_basic' => null, - 'logout_on_user_change' => true, ), ), ));