From 774a16150f544a95a5df7c5e4bf39e3a579e85e5 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 3 Feb 2020 09:39:20 +0100 Subject: [PATCH] Fix merge --- .github/patch-types.php | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/patch-types.php b/.github/patch-types.php index 2552dec99067..2df0774bec4c 100644 --- a/.github/patch-types.php +++ b/.github/patch-types.php @@ -27,6 +27,7 @@ case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'): case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadFileName.php'): case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'): + case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/ParseError.php'): case false !== strpos($file, '/src/Symfony/Component/Debug/Tests/Fixtures/'): case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'): case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):