resolve merge

[lilypond.git] / input / regression / lyrics-no-notes.ly

diff --git a/input/regression/lyrics-no-notes.ly b/input/regression/lyrics-no-notes.ly
index 3c6ef07e790dd3eb4fe54118954dde5d55a25de1..924127a701a01b589d38ca5000c229f32c87d613 100644 (file)
--- a/input/regression/lyrics-no-notes.ly
+++ b/input/regression/lyrics-no-notes.ly
@@ -6,8 +6,9 @@ paper column is very wide."
  
 \layout{ ragged-right = ##t }
 
-\version "2.12.0"
+\version "2.14.0"
 <<
+  \override Score.PaperColumn #'keep-inside-line = ##f
   \new Staff \relative c' {
     \key aes \major
     \context Voice = "1" {