resolve merge

[lilypond.git] / input / regression / size26.ly

diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index 47fbd755f3185b64aac3ae3d1f8d561f02b9a7a4..37a228ab21692ff8e3a0151d2826bb4e4ea2489f 100644 (file)
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -1,4 +1,13 @@
-\version "1.3.146"
+\version "2.14.0"
+foollilypondbook = "
+\score
+"
 
-\include "paper26.ly"
-\include "allfontstyle.ly"
+\header {
+    texidoc ="Staff height 26 pt."
+    }
+
+
+
+#(set-global-staff-size 26)
+\include "allfontstyle.ily"