diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-05-14 13:20:38 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-05-14 13:20:38 +0200 |
| commit | f0eb642cb047393d4211d00c4592616bf79deb43 (patch) | |
| tree | e6e49b15d8db88249142c462186cf9c7b448b721 /ext/pdo_odbc | |
| parent | 5b7575ebe25321c2082f5376b43af24e8e883158 (diff) | |
| parent | 2244a7d9afe89979b0d33e6665784996a11ad820 (diff) | |
| download | php-git-f0eb642cb047393d4211d00c4592616bf79deb43.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent further potential test conflicts
Diffstat (limited to 'ext/pdo_odbc')
| -rw-r--r-- | ext/pdo_odbc/tests/CONFLICTS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pdo_odbc/tests/CONFLICTS b/ext/pdo_odbc/tests/CONFLICTS new file mode 100644 index 0000000000..a3722b55c5 --- /dev/null +++ b/ext/pdo_odbc/tests/CONFLICTS @@ -0,0 +1 @@ +odbc |