From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Sun, 31 Jul 2011 06:57:47 +0000 (+0100)
Subject: Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git
X-Git-Tag: release/2.15.8-1~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=54b02666750062788185bd3f99e644d621e348c2;hp=bf3779b4d349f9da9d6a8af1777c6f5ea54a7112;p=lilypond.git

Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git
---

diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index b1ecf25294..17fe46d16a 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -29,8 +29,8 @@ they go past the first note. "
   } \addlyrics {
     bla16 -- bla -- bla -- bla --
     bla -- bla -- bla -- bla8 --
-    bla16 -- bla -- bla 
+    bla16 -- bla -- bla
   }
 >>
 
-  
+