resolve merge

[lilypond.git] / input / regression / markup-stack.ly

diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index 4d84c3e2c1f5917741eaa9a05fd3d982c28f210d..a461a7f87c8036d913c615808ab16615633eefdf 100644 (file)
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {texidoc="Markup scripts may be stacked."}
 \layout { ragged-right = ##t}
 {