resolve merge

[lilypond.git] / input / regression / spacing-loose-grace-linebreak.ly

diff --git a/input/regression/spacing-loose-grace-linebreak.ly b/input/regression/spacing-loose-grace-linebreak.ly
index 8cc2597294cd392a5835cc98cc02db972d2dea6c..3790c2a3a2c6321cf31150760cb4797799a0222e 100644 (file)
--- a/input/regression/spacing-loose-grace-linebreak.ly
+++ b/input/regression/spacing-loose-grace-linebreak.ly
@@ -4,12 +4,17 @@ across a line break, it gets attached to the end of line."
 }
 
 
-\version "2.12.0"
+\version "2.14.0"
 
-\new Score \with {
-  \override SpacingSpanner #'strict-grace-spacing = ##t
-  \override PaperColumn #'used = ##t 
-} <<
+\layout {
+  \context {
+    \Score
+    \override SpacingSpanner #'strict-grace-spacing = ##t
+  }
+}
+
+\score {
+ <<
 
   \new Staff <<
 
@@ -36,4 +41,5 @@ across a line break, it gets attached to the end of line."
     }
   >>
 >>
+}