Resolve conflict

[lilypond.git] / input / lsr / keyboards.snippet-list

diff --git a/input/lsr/keyboards.snippet-list b/input/lsr/keyboards.snippet-list
index 2da59b2fd4983ea5e5b27c5ae8b99b11435f1a6a..feb6826cf0166ce3313e778ae47da4bfbac014a9 100644 (file)
--- a/input/lsr/keyboards.snippet-list
+++ b/input/lsr/keyboards.snippet-list
@@ -1 +1,14 @@
+indicating-cross-staff-chords-with-arpeggio-bracket.ly
+clusters.ly
+creating-slurs-across-voices.ly
+piano-template-with-centered-lyrics.ly
+vocal-ensemble-template-with-automatic-piano-reduction.ly
+piano-template-simple.ly
+controlling-the-placement-of-chord-fingerings.ly
+laissez-vibrer-ties.ly
+accordion-discant-symbols.ly
+fine-tuning-pedal-brackets.ly
+piano-template-with-melody-and-lyrics.ly
 piano-template-with-centered-dynamics.ly
+jazz-combo-template.ly
+demo-midiinstruments.ly