From 896e4d3428acec5b196418adaf0c25a5f394228e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Dec 2020 10:31:35 +0100 Subject: [PATCH] Add CONFLICTS file for PDO firebird tests Just in case anybody executes these test in parallel on PHP 7.4. (cherry picked from commit b4ffe5417440b399c2511a8176179be2f8ef3512) Closes GH-6943. --- ext/pdo_firebird/tests/CONFLICTS | 1 + 1 file changed, 1 insertion(+) create mode 100644 ext/pdo_firebird/tests/CONFLICTS diff --git a/ext/pdo_firebird/tests/CONFLICTS b/ext/pdo_firebird/tests/CONFLICTS new file mode 100644 index 00000000000..4667cdfa076 --- /dev/null +++ b/ext/pdo_firebird/tests/CONFLICTS @@ -0,0 +1 @@ +firebird