Skip to content

Commit c25b1a7

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fix failing tests/lang due to whitespace
2 parents 102cf75 + ed64e1d commit c25b1a7

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

tests/lang/023.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date.timezone=UTC
55
--FILE--
66
PHP Regression Test
77

8-
<?php
8+
<?php
99

1010
include("023-1.inc");
1111

@@ -246,7 +246,7 @@ $i=2<br>
246246

247247
*** Nested file include test ***<br>
248248
<html>
249-
This is Finish.phtml. This file is supposed to be included
249+
This is Finish.phtml. This file is supposed to be included
250250
from regression_test.phtml. This is normal HTML.
251251
and this is PHP code, 2+2=4
252252
</html>

0 commit comments

Comments
 (0)