Merge commit 'origin' into includes

[lilypond.git] / input / lsr / suppressing-warnings-for-clashing-note-columns.ly

diff --git a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
index 9dc798d3066ad0957aa767b121f0919ba0e3d352..50cfa3ccef72ecbbc13b04f70dd83858fa226505 100644 (file)
--- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
+++ b/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.61"
+\version "2.12.0"
 \header {
   lsrtags = "simultaneous-notes,tweaks-and-overrides"
   texidoc = "
@@ -15,10 +15,14 @@ to @code{#t}.
   doctitle = "Suppressing warnings for clashing note columns"
 } % begin verbatim
 
+
 ignore = \override NoteColumn #'ignore-collision = ##t
 
-\relative c' <<
-  \ignore
-  { \stemDown f2 g } \\
-  { c2 c, }
->>
+\relative c' {
+  <<
+    \ignore
+    { \stemDown f2 g }
+    \\
+    { c2 c, }
+  >>
+}