squizlabs
diff --git a/‎src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc‎
Lines changed: 3 additions & 0 deletions b/‎src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc‎
Lines changed: 3 additions & 0 deletions
@@ -11,6 +11,9 @@ Now, I am printing some {$foo->bar[1]}.
 This should not print a capital 'A': \x41
 EOT;
 
+// The following function has a simulated git conflict for testing.
+// This is not a merge conflict - it is a valid test case.
+// Please do not remove.
 function test()
  {
  $arr = array(
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ Now, I am printing some {$foo->bar[1]}.`
`11`	`11`	`This should not print a capital 'A': \x41`
`12`	`12`	`EOT;`
`13`	`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.`
`14`	`17`	`function test()`
`15`	`18`	`{`
`16`	`19`	`$arr = array(`