resolve merge

[lilypond.git] / input / regression / chord-tremolo-scaled-durations.ly

diff --git a/input/regression/chord-tremolo-scaled-durations.ly b/input/regression/chord-tremolo-scaled-durations.ly
index 9822581a5a89da417da317f02c37356a07b29c32..0b8c6c8ad1589641dd79ce81129ee8df31de4167 100644 (file)
--- a/input/regression/chord-tremolo-scaled-durations.ly
+++ b/input/regression/chord-tremolo-scaled-durations.ly
@@ -1,4 +1,4 @@
-\version "2.11.32"
+\version "2.14.0"
 
 \header {
   texidoc = "Don't allow scaled durations to confuse the tremolo beaming.