Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / collision-2.ly

diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly
index 3983d8f88451f6d16344e83837284dab2da0a3a8..470bb61e4381746057f4bdd7c7c8819a48f292ce 100644 (file)
--- a/input/regression/collision-2.ly
+++ b/input/regression/collision-2.ly
@@ -1,17 +1,14 @@
-\version "1.7.18"
+\version "2.11.51"
 \header {
-texidoc = "Collisions for single head notes. "
+texidoc = "Single head notes may collide. "
 }
-    \paper { raggedright= ##t }
 
+\layout { ragged-right= ##t }
 
-\score {
-    \notes
 
-  \context Staff \notes \transpose c c' <  
-       {  c4 d e f g2 g4 a | }  \\
-       { g4 f e g  g2 g2 } 
-  >
-}
+\context Staff  \transpose c c' <<  
+  {  c4 d e f g2 g4 a | }  \\
+  { g4 f e g  g2 g2 } 
+>>