Merge branch 'master' into lilypond/translation

[lilypond.git] / input / regression / lyric-combine.ly

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index dd8ec91e2debf4ab6d11e098e18ce6110300e705..1c213476f1d3a57f5a7c1841f959797c59be223c 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.11.38"
+\version "2.14.0"
 
 \header{
 
@@ -8,7 +8,7 @@ lyrics will be discarded.  Lyrics will not be set over rests.  You can
 have melismata either by setting a property melismaBusy, or by setting
 automaticMelismas (which will set melismas during slurs and ties).  If
 you want a different order than first Music, then Lyrics, you must
-precook a chord of staves/lyrics and label those.  Of course, the
+precook a chord of staves/@/lyrics and label those.  Of course, the
 lyrics ignore any other rhythms in the piece."
 
 }