summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-01-26 11:36:50 +0000
committerJoe Watkins <krakjoe@php.net>2017-01-26 11:36:50 +0000
commit68801c9a308e49c5e801ac894673e68e448b31c4 (patch)
treeb8a6c92041fd987b6aa86af1546ed31522a08ed5
parent306f55bef43f18bd0502dcd9f14089eec4a19d0d (diff)
parentbf914ff75a79aaacffebf689e6dd2b17175070b0 (diff)
downloadphp-git-68801c9a308e49c5e801ac894673e68e448b31c4.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: Fix 00version.phpt when commit message has multiple lines.
-rw-r--r--ext/pgsql/tests/00version.phpt2
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