File tree Expand file tree Collapse file tree 2 files changed +17
-15
lines changed
src/Standards/Squiz/Tests/PHP Expand file tree Collapse file tree 2 files changed +17
-15
lines changed Original file line number Diff line number Diff line change @@ -10,18 +10,3 @@ My name is "$name". I am printing some $foo->foo.
1010Now, I am printing some {$foo->bar[1]}.
1111This should not print a capital 'A': \x41
1212EOT;
13-
14- // The following function has a simulated git conflict for testing.
15- // This is not a merge conflict - it is a valid test case.
16- // Please do not remove.
17- function test ()
18- {
19- $ arr = array (
20- 'a ' => 'a '
21- <<<<<<< HEAD
22- 'b' => ' b'
23- =======
24- 'c' => ' c'
25- >>>>>>> master
26- );
27- }
Original file line number Diff line number Diff line change 1+ <?php
2+
3+ // Intentional parse error.
4+ // The following function has a simulated git conflict for testing.
5+ // This is not a merge conflict - it is a valid test case.
6+ // Please do not remove.
7+ function test ()
8+ {
9+ $ arr = array (
10+ 'a ' => 'a '
11+ <<<<<<< HEAD
12+ 'b' => ' b'
13+ =======
14+ 'c' => ' c'
15+ >>>>>>> master
16+ );
17+ }
You can’t perform that action at this time.
0 commit comments