Resolve conflict

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

diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index c02f7822d6818eee393cb31d9b6c5ebd7e83b37d..09cd4f4e33fad794dd3038131448ad44460bb20b 100644 (file)
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -1,4 +1,4 @@
-\version "2.1.26"
+\version "2.11.51"
 foollilypondbook = "
 \score
 "
@@ -10,4 +10,4 @@ foollilypondbook = "
 
 
 #(set-global-staff-size 20)
-\include "allfontstyle.lyinc"
+\include "allfontstyle.ily"