resolve merge

[lilypond.git] / input / regression / song-melisma.ly

diff --git a/input/regression/song-melisma.ly b/input/regression/song-melisma.ly
index 6eb952706164b461c32e0941e4e3637ff8c89a52..a78f8a5096bf028404ffa05cf8a86232f1ffb316 100644 (file)
--- a/input/regression/song-melisma.ly
+++ b/input/regression/song-melisma.ly
@@ -1,5 +1,9 @@
-\version "2.12.0"
-
+\version "2.14.0"
+\header {
+  texidoc="Festival song synthesis output supports
+melismas.
+"
+}
 \include "festival.ly"
 
 \festival #"song-melisma.xml" { \tempo 4 = 100 }