diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-26 11:36:36 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-26 11:36:36 +0000 |
| commit | bf914ff75a79aaacffebf689e6dd2b17175070b0 (patch) | |
| tree | cf465c6f9128795e5b958611415c6161f889c8d4 | |
| parent | 2d339fa4d1e82c888e4f514a741eb7ac14055671 (diff) | |
| parent | a3d3f76827c7c26f4cd9cdde967d4ed7cb7889fe (diff) | |
| download | php-git-bf914ff75a79aaacffebf689e6dd2b17175070b0.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix 00version.phpt when commit message has multiple lines.
| -rw-r--r-- | ext/pgsql/tests/00version.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pgsql/tests/00version.phpt b/ext/pgsql/tests/00version.phpt index e4e442d018..f068abe2c6 100644 --- a/ext/pgsql/tests/00version.phpt +++ b/ext/pgsql/tests/00version.phpt @@ -46,5 +46,5 @@ array(13) { ["application_name"]=> string(%d) %s } -string(%d) "%s" +string(%d) "%a" OK |