resolve merge

[lilypond.git] / Documentation / es / texidocs / stand-alone-two-column-markup.texidoc

diff --git a/Documentation/es/texidocs/stand-alone-two-column-markup.texidoc b/Documentation/es/texidocs/stand-alone-two-column-markup.texidoc
new file mode 100644 (file)
index 0000000..6cbcaf3
--- /dev/null
+++ b/Documentation/es/texidocs/stand-alone-two-column-markup.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 615cbf212fdaf0b220b3330da417d0c3602494f2
+  texidoces = "
+Los textos independientes se pueden disponer en varias columnas
+utilizando instrucciones @code{\\markup}:
+
+"
+  doctitlees = "Elemento de marcado de texto independiente en dos columnas"
+