Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / suppressing-warnings-for-clashing-note-columns.ly

diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 29de9a64ec4cfa08cedee811448ab615a0f17032..726b2978d3be7bd57c6948c9d035b152036b45f4 100644 (file)
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
@@ -24,7 +24,7 @@ used with care.
   doctitle = "Suppressing warnings for clashing note columns"
 } % begin verbatim
 
-ignore = \override NoteColumn #'ignore-collision = ##t
+ignore = \override NoteColumn.ignore-collision = ##t
 
 \relative c' {
   <<