Skip to content
Browse files

Resolved conflict.

  • Loading branch information...
2 parents aecf548 + c0f806a commit c02aa086c6d075e765d75476b05fa3df3da68c13 @conf conf committed Mar 29, 2012
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

0 comments on commit c02aa08

Please sign in to comment.
Something went wrong with that request. Please try again.