resolve merge

[lilypond.git] / input / texidocs / vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc

diff --git a/input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc b/input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
deleted file mode 100644 (file)
index 0942b05..0000000
--- a/input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
+++ /dev/null
@@ -1,14 +0,0 @@
-  texidoces = "
-Esta plantilla es, básicamente, la misma que la sencilla plantilla
-\"Conjunto vocal\", excepto que aquí todas las líneas de letra se
-colocan utilizando @code{alignAboveContext} y
-@code{alignBelowContext}.
-
-"
-  doctitlees = "Plantilla para conjunto vocal con letras alineadas encima y debajo de los pentagramas"
-  
-  texidocde = "
-In diesem Beispiel werden die Texte mit den Befehlen 
-@code{alignAboveContext} und @code{alignBelowContext}
-über und unter dem System angeordnet.
-"