Resolve conflict

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

diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index 7fd85706d91521a9f85b67b03e8f247c62f1aa06..5237b9da62ad98620357d192ffe5dfd4e9a1778c 100644 (file)
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -1,16 +1,16 @@
-\version "2.11.51"
 creating-cross-staff-arpeggios-in-a-piano-staff.ly
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 creating-arpeggios-across-notes-in-different-voices.ly
 creating-cross-staff-arpeggios-in-other-contexts.ly
 printing-hairpins-using-al-niente-notation.ly
+laissez-vibrer-ties.ly
 contemporary-glissando.ly
 adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
 line-arrows.ly
 hiding-the-extender-line-for-text-dynamics.ly
 vertically-aligning-dynamics-across-multiple-notes.ly
-modifying-default-values-for-articulation-shorthand-notation.ly
+horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
 changing-text-and-spanner-styles-for-text-dynamics.ly
 controlling-the-vertical-ordering-of-scripts.ly
 inserting-a-caesura.ly
@@ -25,6 +25,7 @@ combining-dynamics-with-markup-texts.ly
 creating-slurs-across-voices.ly
 caesura-railtracks-with-fermata.ly
 changing-the-breath-mark-symbol.ly
+modifying-default-values-for-articulation-shorthand-notation.ly
 creating-simultaneous-rehearsal-marks.ly
 setting-hairpin-behavior-at-bar-lines.ly
 changing--flageolet-mark-size.ly