From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sat, 18 Oct 2008 15:29:27 +0000 (+0200)
Subject: Resolve conflict on scm/midi.scm
X-Git-Tag: release/2.11.65-1~51^2~2^2~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=187f1f619ecd5a8f42c5baf92782df1f64cbf2d9;p=lilypond.git

Resolve conflict on scm/midi.scm
---

diff --git a/scm/midi.scm b/scm/midi.scm
index cf43d3af75..a5c1bd338d 100644
--- 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)))))))