resolve merge

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

diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 35824868cc6b99ae83795936199df2c3126c776c..16cc40bf18b55a55a4cd6a1848d277928497103f 100644 (file)
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {
   texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
     lines can be associated with one melody line. Each lyric line