resolve merge

[lilypond.git] / input / lsr / stand-alone-two-column-markup.ly

diff --git a/input/lsr/stand-alone-two-column-markup.ly b/input/lsr/stand-alone-two-column-markup.ly
deleted file mode 100644 (file)
index ae1eeba..0000000
--- a/input/lsr/stand-alone-two-column-markup.ly
+++ /dev/null
@@ -1,45 +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 = "text"
-
-  texidoces = "
-Los textos independientes se pueden disponer en varias columnas
-utilizando instrucciones @code{\\markup}:
-
-"
-  doctitlees = "Elemento de marcado de texto independiente en dos columnas"
-
-  texidoc = "
-Stand-alone text may be arranged in several columns using
-@code{\\markup} commands:
-
-"
-  doctitle = "Stand-alone two-column markup"
-} % begin verbatim
-
-\markup {
-  \fill-line {
-    \hspace #1
-    \column {
-      \line { O sacrum convivium }
-      \line { in quo Christus sumitur, }
-      \line { recolitur memoria passionis ejus, }
-      \line { mens impletur gratia, }
-      \line { futurae gloriae nobis pignus datur. }
-      \line { Amen. }
-    }
-    \hspace #2
-    \column {
-      \line { \italic { O sacred feast } }
-      \line { \italic { in which Christ is received, } }
-      \line { \italic { the memory of His Passion is renewed, } }
-      \line { \italic { the mind is filled with grace, } }
-      \line { \italic { and a pledge of future glory is given to us. } }
-      \line { \italic { Amen. } }
-    }
-    \hspace #1
-  }
-}