resolve merge

[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
deleted file mode 100644 (file)
index d3cecd2..0000000
--- a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly
+++ /dev/null
@@ -1,29 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "simultaneous-notes, tweaks-and-overrides"
-
-  texidoc = "
-If notes from two voices with stems in the same direction are placed at
-the same position, and both voices have no shift or the same shift
-specified, the error message \"warning: ignoring too many clashing note
-columns\" will appear when compiling the LilyPond file.  This message
-can be suppressed by setting the @code{'ignore-collision} property of
-the @code{NoteColumn} object 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, }
-  >>
-}