diff options
| author | Shein Alexey <confik@gmail.com> | 2012-03-29 17:03:43 +0500 |
|---|---|---|
| committer | Shein Alexey <confik@gmail.com> | 2012-03-29 17:03:43 +0500 |
| commit | c02aa086c6d075e765d75476b05fa3df3da68c13 (patch) | |
| tree | f731d2b64cec00416e4828ac0b29536ad9bd661f | |
| parent | aecf5485e3af6a1e405f29f653353ae1237dbb3e (diff) | |
| parent | c0f806a69c600996c9af4195f2136412160b0fc0 (diff) | |
| download | php-git-c02aa086c6d075e765d75476b05fa3df3da68c13.tar.gz | |
Resolved conflict.
| -rw-r--r-- | ext/standard/tests/streams/bug61115-1.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index cfed64f039..573496edf0 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp); ftruncate($fileResourceTemp, PHP_INT_MAX); ?> --EXPECTF-- -Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line %d +Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d |