Resolve conflict

[lilypond.git] / input / lsr / tweaks-and-overrides.snippet-list

diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index 12cce7b080487b68b0a374ee63ada9c2e4b6bbf0..f2d6ce73c14152665acbc8fe96ac76907e94fa6e 100644 (file)
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -1,3 +1,4 @@
+dotted-harmonics.ly
 forcing-horizontal-shift-of-notes.ly
 display-bracket-with-only-one-staff-in-a-system.ly
 rhythmic-slashes.ly