resolve merge

[lilypond.git] / input / regression / beam-default-lengths.ly

diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index 9ec0c2bb1b90c16e09fd58bd660c538e9d0e4fd6..e6e3a265161e8f9f4ca67d7e4e7fed080a48fbfa 100644 (file)
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
   texidoc = "Beamed stems have standard lengths if possible.  Quantization