resolve merge

[lilypond.git] / input / regression / lyric-extender-rest.ly

diff --git a/input/regression/lyric-extender-rest.ly b/input/regression/lyric-extender-rest.ly
index ccf9aff74db6852eab1a36068a40e563177e5f42..94d84c2a6da90f73bfb1c2183dc2a0e30a6eb040 100644 (file)
--- a/input/regression/lyric-extender-rest.ly
+++ b/input/regression/lyric-extender-rest.ly
@@ -10,7 +10,7 @@ is not terminated upon encountering a rest. "
   ragged-right = ##T
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
 <<
   \new Voice = "one" \relative c'' {