resolve merge

[lilypond.git] / Documentation / es / user / notation.itely

diff --git a/Documentation/es/user/notation.itely b/Documentation/es/user/notation.itely
deleted file mode 100644 (file)
index ce26345..0000000
--- a/Documentation/es/user/notation.itely
+++ /dev/null
@@ -1,35 +0,0 @@
-@c -*- coding: utf-8; mode: texinfo; -*-
-@ignore
-    Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
-
-    When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
-@end ignore
-
-@c \version "2.12.0"
-
-@node Musical notation
-@chapter Musical notation
-
-Este capítulo explica cómo crear notación musical.
-
-@menu
-* Pitches::            Escritura y presentación de la altura de las notas.
-* Rhythms::            Escritura y presentación de las duraciones de las notas.
-* Expressive marks::   Añadir expresión a las notas.
-* Repeats::            Repetir música.
-* Simultaneous notes:: Más de una nota a la vez.
-* Staff notation::     Imprimir pentagramas.
-* Editorial annotations::  Notación especial para aumentar la legibilidad.
-* Text::               Añadir texto a las partituras.
-@end menu
-
-@include pitches.itely
-@include rhythms.itely
-@include expressive.itely
-@include repeats.itely
-@include simultaneous.itely
-@include staff.itely
-@include editorial.itely
-@include text.itely
-