Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Resolved conflict.

  • Loading branch information...
commit c02aa086c6d075e765d75476b05fa3df3da68c13 2 parents aecf548 + c0f806a
@conf conf authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  ext/standard/tests/streams/bug61115-1.phpt
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.