Resolve conflict

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

diff --git a/input/lsr/repeats.snippet-list b/input/lsr/repeats.snippet-list
index a04d57124b71be3540a86a2a4bb2cfa9c5fbf2f7..2ffca138b7a7a94195202d4b1cc1b9177ad83116 100644 (file)
--- a/input/lsr/repeats.snippet-list
+++ b/input/lsr/repeats.snippet-list
@@ -1,5 +1,10 @@
-positioning-segno-and-coda-with-line-break.ly
-volta-below-chords.ly
+measure-counter.ly
 adding-volta-brackets-to-additional-staves.ly
-volta-multi-staff.ly
+isolated-percent-repeats.ly
+volta-text-markup-using-repeatcommands.ly
+printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
+positioning-segno-and-coda-with-line-break.ly
 shortening-volta-brackets.ly
+volta-multi-staff.ly
+percent-repeat-counter.ly
+volta-below-chords.ly