resolve merge

[lilypond.git] / input / texidocs / grouping-beats.texidoc

diff --git a/input/texidocs/grouping-beats.texidoc b/input/texidocs/grouping-beats.texidoc
deleted file mode 100644 (file)
index b0bbfd8..0000000
--- a/input/texidocs/grouping-beats.texidoc
+++ /dev/null
@@ -1,14 +0,0 @@
-  texidoces = "
-Los patrones de barrado se pueden alterar con la propiedad
-@code{beatGrouping}:
-
-"
-  doctitlees = "Agrupar los pulsos"
-  
-%% Translation of GIT committish :<6ce7f350682dfa99af97929be1dec6b9f1cbc01a>
-texidocde = "
-Balkengruppen können mit der @code{beatGrouping}-Eigenschaft geändert
-werden:
-
-"
-  doctitlede = "Notengruppen"