resolve merge

[lilypond.git] / input / regression / skyline-vertical-placement.ly

diff --git a/input/regression/skyline-vertical-placement.ly b/input/regression/skyline-vertical-placement.ly
index 731db4f2c520dd0ca63e157a2ce6fbcc8d1359f8..d8b44e95fdeedd53b0065c16628f99ebc4631433 100644 (file)
--- a/input/regression/skyline-vertical-placement.ly
+++ b/input/regression/skyline-vertical-placement.ly
@@ -5,8 +5,9 @@ using a skyline algorithm so that they don't collide with other objects."
 
 \layout {ragged-right = ##t}
 
-\version "2.12.0"
+\version "2.14.0"
 \relative c''' {
+  \override Score.PaperColumn #'keep-inside-line = ##f
   \override TextScript #'outside-staff-priority = #2
   \override DynamicLineSpanner #'outside-staff-priority = #1
   c