resolve merge

[lilypond.git] / input / lsr / expressive-marks.snippet-list

diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
deleted file mode 100644 (file)
index 52e644d..0000000
--- a/input/lsr/expressive-marks.snippet-list
+++ /dev/null
@@ -1,39 +0,0 @@
-adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
-adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
-adjusting-the-shape-of-falls-and-doits.ly
-breathing-signs.ly
-broken-crescendo-hairpin.ly
-caesura-railtracks-with-fermata.ly
-center-text-below-hairpin-dynamics.ly
-changing--flageolet-mark-size.ly
-changing-text-and-spanner-styles-for-text-dynamics.ly
-changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
-changing-the-breath-mark-symbol.ly
-combining-dynamics-with-markup-texts.ly
-contemporary-glissando.ly
-controlling-the-vertical-ordering-of-scripts.ly
-creating-a-delayed-turn.ly
-creating-arpeggios-across-notes-in-different-voices.ly
-creating-cross-staff-arpeggios-in-a-piano-staff.ly
-creating-cross-staff-arpeggios-in-other-contexts.ly
-creating-real-parenthesized-dynamics.ly
-creating-simultaneous-rehearsal-marks.ly
-creating-slurs-across-voices.ly
-creating-text-spanners.ly
-double-glissando.ly
-hiding-the-extender-line-for-text-dynamics.ly
-horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
-inserting-a-caesura.ly
-laissez-vibrer-ties.ly
-line-arrows.ly
-modifying-default-values-for-articulation-shorthand-notation.ly
-piano-template-with-centered-dynamics.ly
-positioning-text-markups-inside-slurs.ly
-printing-hairpins-using-al-niente-notation.ly
-printing-metronome-and-rehearsal-marks-below-the-staff.ly
-setting-hairpin-behavior-at-bar-lines.ly
-setting-the-minimum-length-of-hairpins.ly
-snap-pizzicato-markup-bartok-pizzicato.ly
-using-double-slurs-for-legato-chords.ly
-vertical-line-as-a-baroque-articulation-mark.ly
-vertically-aligning-dynamics-across-multiple-notes.ly