resolved conflicts

deemonic · deemonic · commit ac75c4df53f6 · 2024-10-25T16:31:32.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /vendor
 composer.lock
-.phpunit.result.cache
+.phpunit.result.cache
+/.idea
diff --git a/src/BlaspExpressionService.php b/src/BlaspExpressionService.php
@@ -129,7 +129,6 @@ private function loadConfiguration(): void
     private function generateSeparatorExpression(): string
     {
         return $this->generateEscapedExpression($this->separators, $this->escapedSeparatorCharacters);
-        return !empty($separatorExpression) ? $separatorExpression . '?' : '';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ private function loadConfiguration(): void`
`129`	`129`	`private function generateSeparatorExpression(): string`
`130`	`130`	`{`
`131`	`131`	`return $this->generateEscapedExpression($this->separators, $this->escapedSeparatorCharacters);`
`132`		`- return !empty($separatorExpression) ? $separatorExpression . '?' : '';`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`/**`