resolve merge

[lilypond.git] / input / regression / tuplet-beam.ly

diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index 1b9d32ee597b89028c68a4636eb26b7866380f4c..caef660f5334ddeff407d391916fcb0d2d5c4897 100644 (file)
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header {
 
   texidoc = "In combination with a beam, the bracket of the tuplet