* cleanup merge artefacts

compiler/ninl.pas

@@ -6074,20 +6074,7 @@ implementation
          result:=nil;
        end;
 
-//
-//||||||| .merge-left.r31134
-//
-//{$ifdef ARM}
-//              {$i armtype.inc}
-//{$endif ARM}
-//=======
-//
-//{$ifdef x86}
-//              {$i x86type.inc}
-//{$endif x86}
-//{$ifdef ARM}
-//              {$i armtype.inc}
-//{$endif ARM}
+
 {$if not defined(cpu64bitalu) and not defined(cpuhighleveltarget)}
      function tinlinenode.first_ShiftRot_assign_64bitint: tnode;
        var