From b128423b64bd34900d7f77b4ad60caffff748e8c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 4 Feb 2021 19:05:54 +0100 Subject: [PATCH] fix merge --- .../Tests/DeprecationErrorHandler/partially_quiet.phpt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt index f1fb64ed13..83b135b34b 100644 --- a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt +++ b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/partially_quiet.phpt @@ -24,7 +24,7 @@ require __DIR__.'/fake_vendor/acme/outdated-lib/outdated_file.php'; --EXPECTF-- Unsilenced deprecation notices (3) -Remaining direct deprecation notices (1) +Remaining direct deprecation notices (2) Remaining indirect deprecation notices (1) @@ -33,5 +33,3 @@ Remaining indirect deprecation notices (1) Legacy deprecation notices (2) -Other deprecation notices (1) -