fix merge

This commit is contained in:
Nicolas Grekas 2021-02-04 19:05:54 +01:00
parent a8fc934907
commit b128423b64

View File

@ -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)