*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index d9da776d8f3b848db27748479f042196530a28e6..0b61dad2ea26fa87352eba2430a4959945e31164 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * VERSION: release 2.9.20
+
 2006-10-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * scm/define-grob-properties.scm (all-user-grob-properties):
@@ -142,7 +146,6 @@
        * lily/source-file.cc (get_line): fix off-by-one error
        and clean up some of the logic
 
->>>>>>> 1.5342
 2006-09-29  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/page-breaking.cc (make_pages): honour the first-page-number

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 46f7ffe553cc4e8cb5ddce007f22b785517e0a42..dee817c6fea2fe779ba3ddbb6c79d0dba58ef60b 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -205,6 +205,7 @@ contained staves are not connected vertically."
 
   %% must come before Script_column_engraver.
   \consists "New_fingering_engraver"
+  
   \consists "Chord_tremolo_engraver"
   \consists "Percent_repeat_engraver"
   \consists "Slash_repeat_engraver"