Release: bump Welcome versions.

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

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 27b7857e79fd2fce3d3cf47e7c1d82fa54ba867e..b1d9b1e598d5e87c5de8212a40bb7fb4a8fcbf91 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,34 +1,18 @@
-#(ly:set-option 'old-relative)
-\version "2.1.7"
+\version "2.19.21"
 \header {
-    texidoc =
-
-    "If @code{merge-differently-headed}, then
-open note heads may be merged with black noteheads, but only
-if the black note heads are from 8th or shorter notes.
-"
-    
+  texidoc =
+  "Open and black note heads are not merged by default."
+  
 }
-    \paper { raggedright= ##t }
 
+\layout { ragged-right= ##t }
 
-\score { \notes \context Staff\relative c''<<
-\new Voice {
-    \voiceOne
-    c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}
-\new Voice {
-    \voiceTwo
-    c8 c4.
-    c2
-    c8 c4.
-    c2
-    c4
-}
-    >>
-        }
+
+\context Staff  \relative <<
+  {
+    c''2 c8 c4.
+  }\\
+  {
+    c8 c4. c2
+  }
+>>