resolve merge

[lilypond.git] / input / regression / lyric-ignore-melisma-alignment.ly

diff --git a/input/regression/lyric-ignore-melisma-alignment.ly b/input/regression/lyric-ignore-melisma-alignment.ly
index dec5231a5afe9f4b65656ec4e31ed5f778eeee24..994b8cfc0482d3fa584ef2ca310214cc2523b548 100644 (file)
--- a/input/regression/lyric-ignore-melisma-alignment.ly
+++ b/input/regression/lyric-ignore-melisma-alignment.ly
@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.0"
 
 \header {
   texidoc = "If @code{ignoreMelismata} is set, lyrics should remain