bircher / php-merge

src/PhpMerge/MergeConflict.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
      */
     private static function fixEOL(array $lines)
     {
-        $ltrim = function ($line) {
+        $ltrim = function($line) {
             return rtrim($line, "\n");
         };
         return array_map($ltrim, $lines);

src/PhpMerge/internal/PhpMergeBase.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
     protected static function preMergeAlter($text) : string
     {
         // Append new lines so that conflicts at the end of the text work.
-        return $text . "\nthe\nend";
+        return $text."\nthe\nend";
     }
 
     /**