Merge commit 'origin' into includes

[lilypond.git] / input / regression / collision-head-chords.ly

diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 2ec400adb77c1dc4e8d8ab8a5458adc8390d4a40..248e6748092d7677d204bc2609e9e167d50f896d 100644 (file)
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,18 +1,18 @@
-\version "2.1.26"
+\version "2.12.0"
 \header {
-texidoc = "Note heads in collisions should be merged if
+  texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  
 "
 
 }
+\layout {ragged-right = ##t}
 
 
-\score {
-\notes  \relative c'' {
-c4 
+
+\relative c'' {
+  c4 
   << { c4 d4 <c d>8  <c d> <c d> } \\  { c4 c <a b>8 <b c> <c d>8 } >>
 }
-\paper {raggedright = ##t} 
-}
+