resolved conflict in phpCode extractor

oscarotero · oscarotero · commit 76ea2b3ae45e · 2013-12-01T14:52:13.000+01:00
diff --git a/Gettext/Extractors/PhpCode.php b/Gettext/Extractors/PhpCode.php
@@ -46,6 +46,7 @@ static public function parse ($file, Entries $entries) {
 			if (($value[0] === T_STRING) && is_string($tokens[$k + 1]) && ($tokens[$k + 1] === '(')) {
 				array_unshift($bufferFunctions, array($value[1], $value[2]));
 				$k++;
+
 				continue;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ static public function parse ($file, Entries $entries) {`
`46`	`46`	`if (($value[0] === T_STRING) && is_string($tokens[$k + 1]) && ($tokens[$k + 1] === '(')) {`
`47`	`47`	`array_unshift($bufferFunctions, array($value[1], $value[2]));`
`48`	`48`	`$k++;`
	`49`	`+`
`49`	`50`	`continue;`
`50`	`51`	`}`
`51`	`52`	`}`