resolve merge

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

diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index ae3ea0e7eb75d84d608b14d3a5322112e4e13414..1a285722b7cf079f9d31f99be8b3a0a69c1bb07c 100644 (file)
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {
     texidoc = "In lyrics, hyphens may be used."
 }