Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / input / regression / collision-merge-dots.ly

diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index 0db6ea43e4221bf0f29f44ff003afdc8d2f39e53..9b3b44697fc3b598e5f42cf3472bdf50c0a96303 100644 (file)
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -1,14 +1,15 @@
 \header {
 
-    texidoc  = "When merging heads, the dots are merged too."
+    texidoc = "When merging heads, the dots are merged too."
     }
-\version "2.1.6"
+\layout { ragged-right = ##t }
 
-\score {
-\notes {
-\relative c'' \new Staff {
+\version "2.12.0"
+
+{
+  \relative c'' \new Staff {
     << { d8. e16 } \\ { d8. b16 } >> 
-    }
+  }
 }
 
-\paper { raggedright = ##t }}
+