resolve merge

[lilypond.git] / input / lsr / guitar-strum-rhythms.ly

diff --git a/input/lsr/guitar-strum-rhythms.ly b/input/lsr/guitar-strum-rhythms.ly
deleted file mode 100644 (file)
index baa3120..0000000
--- a/input/lsr/guitar-strum-rhythms.ly
+++ /dev/null
@@ -1,68 +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 = "rhythms, fretted-strings"
-
-  texidoces = "
-Para la música de guitarra, es posible mostrar los ritmos de rasgueo,
-además de las notas de la melodía, acordes y diagramas de posiciones.
-
-"
-  doctitlees = "Ritmos rasgueados de guitarra"
-
-%% Translation of GIT committish :<6ce7f350682dfa99af97929be1dec6b9f1cbc01a>
-  texidocde = "
-In Guitarrennotation kann neben Melodie, Akkordbezeichnungen und
-Bunddiagrammen auch der Schlagrhythmus angegeben werden.
-
-"
-  doctitldee = "Schlagrhythmus für Guitarren"
-
-  texidoc = "
-For guitar music, it is possible to show strum rhythms, along with
-melody notes, chord names and fret diagrams.
-
-"
-  doctitle = "Guitar strum rhythms"
-} % begin verbatim
-
-\include "predefined-guitar-fretboards.ly"
-<<
-  \new ChordNames {
-    \chordmode {
-      c1 f g c
-    }
-  }
-  \new FretBoards {
-    \chordmode {
-      c1 f g c
-    }
-  }
-  \new Voice \with {
-    \consists "Pitch_squash_engraver"
-  } {
-    \relative c'' {
-      \improvisationOn
-      c4 c8 c c4 c8 c
-      f4 f8 f f4 f8 f
-      g4 g8 g g4 g8 g
-      c4 c8 c c4 c8 c
-    }
-  }
-  \new Voice = "melody" {
-    \relative c'' {
-      c2 e4 e4
-      f2. r4
-      g2. a4
-      e4 c2.
-    }
-  }
-  \new Lyrics {
-    \lyricsto "melody" {
-      This is my song.
-      I like to sing.
-    }
-  }
->>