Docs: run convert-ly for 2.14.0.

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

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 8e776d82d0b37c41fe58121e0a222e017f20697c..1a0a9fba83ee3708cb7960ccf96bd299ddc198ad 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,31 +1,18 @@
-\version "2.3.17"
+\version "2.14.0"
 \header {
-    texidoc =
-
-    "If @code{merge-differently-headed} is enabled, 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 {
-    \context Staff  \relative c'' <<
-       {
-           c2 c8 c4.
-           
-           \override Staff.NoteCollision  #'merge-differently-headed = ##t
-           c2 c8 c4.
-           c2
-       }\\
-       {
-           c8 c4. c2
-           
-           c8 c4. c2
-           c4
-       }
-    >>
-}
+\context Staff  \relative c'' <<
+  {
+    c2 c8 c4.
+  }\\
+  {
+    c8 c4. c2
+  }
+>>