Fix merging problem

[lilypond.git] / input / regression / non-empty-text.ly

diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index 857bc7410a945df61e3fa102e495ce2d8901b32a..82256aac1899a49edac0097d279fddfc856e4418 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,11 +1,14 @@
 
-\version "2.6.0"
+\version "2.10.0"
 
 \header{
   texidoc=" By default, text is set with empty horizontal dimensions.  
 The boolean property @code{no-spacing-rods} in @code{TextScript} is used
 to control the horizontal size of text.  " }
 
+\layout {
+  line-width = 3.0\cm
+}
 
 \relative c''{
   %% \emptyText
@@ -15,8 +18,5 @@ to control the horizontal size of text.  " }
   \fatText
   c_"very wide and long text" c
 }
-\layout {
-  linewidth = 3.0\cm
-}