From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 3 Nov 2006 01:27:25 +0000 (+0100)
Subject: clean failed merge.
X-Git-Tag: release/2.10.0-2~34^2~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=abc4f5321d60eee8a6b7c85f37937d115229f84e;p=lilypond.git

clean failed merge.
---

diff --git a/scm/lily.scm b/scm/lily.scm
index ee17b9fbc7..72e2956467 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -28,10 +28,6 @@
 	      (debug-midi #f "generate human readable MIDI")
 	      (debug-parser #f "debug the bison parser")
 	      (debug-lexer #f "debug the flex lexer")
-	      (debug-midi #f "generate human readable MIDI")
-	      (debug-parser #f "debug the bison parser")
-	      (debug-lexer #f "debug the flex lexer")
-	      (debug-midi #f "generate human readable MIDI")
 	      (delete-intermediate-files #f
 					 "delete unusable PostScript files")
 	      (dump-signatures #f "dump output signatures of each system")