resolve merge

[lilypond.git] / input / lsr / merging-multi-measure-rests-in-a-polyphonic-part.ly

diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly
deleted file mode 100644 (file)
index 81820ce..0000000
--- a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly
+++ /dev/null
@@ -1,38 +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 = "rhythms"
-
-  texidoc = "
-When using multi-measure rests in a polyphonic staff, the rests will be
-placed differently depending on the voice they belong to. However they
-can be printed on the same staff line, using the following setting.
-
-"
-  doctitle = "Merging multi-measure rests in a polyphonic part"
-} % begin verbatim
-
-normalPos = \revert MultiMeasureRest #'staff-position
-
-{
-  <<
-    {
-      c''1
-      R1
-      c''1
-      \normalPos
-      R1
-    }
-    \\
-    {
-      c'1
-      R1
-      c'1
-      \normalPos
-      R1
-    }
-  >>
-}
-