Resolve conflict on scm/midi.scm

diff --git a/scm/midi.scm b/scm/midi.scm
index cf43d3af7592759e5f5887812a1b6f2667665ce1..a5c1bd338d9450f12b858ec49b9095e13e7e53de 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -286,15 +286,15 @@ returns the program of the instrument
 
 (define-public (write-performances-midis performances basename . rest)
   (let ((midi-ext (ly:get-option 'midi-extension)))
-  (let
-      loop
-    ((perfs performances)
-     (count (if (null? rest) 0 (car rest))))
-    (if (pair?  perfs)
-       (begin
-         (ly:performance-write
-          (car perfs)
-          (if (> count 0)
-              (format #f "~a-~a.~a" basename count midi-ext)
-              (format #f "~a.~a" basename midi-ext)))
-         (loop (cdr perfs) (1+ count))))))
+    (let
+       loop
+      ((perfs performances)
+       (count (if (null? rest) 0 (car rest))))
+      (if (pair?  perfs)
+         (begin
+           (ly:performance-write
+            (car perfs)
+            (if (> count 0)
+                (format #f "~a-~a.~a" basename count midi-ext)
+                (format #f "~a.~a" basename midi-ext)))
+           (loop (cdr perfs) (1+ count)))))))