resolve merge

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

diff --git a/input/regression/lyric-extender-right-margin.ly b/input/regression/lyric-extender-right-margin.ly
index 0317b53493728000adafe81cb2c428a8c152901e..62029c715ba0722d0f54ab65cd25d2c2a06fc661 100644 (file)
--- a/input/regression/lyric-extender-right-margin.ly
+++ b/input/regression/lyric-extender-right-margin.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {
   texidoc = "Extenders will not protrude into the right margin"
   }
@@ -6,7 +6,6 @@
 \score{
   {
     \relative c' {
-      \override Score.PaperColumn #'keep-inside-line = ##t
       c4 d e f ~ | \break
       f4 e d c |
     }
@@ -16,4 +15,4 @@
       e d c
     }
   }
-}
\ No newline at end of file
+}