resolve merge

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

diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index 6bff9fd2cb9a34923c0af6cb8c3045fc9ce05742..d576c44d4bf6893ea2ff62acd31c47c48132679e 100644 (file)
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header {
   
   texidoc = "In complex configurations of knee beaming, according to