resolve merge

[lilypond.git] / input / regression / alignment-order.ly

diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly
index a5bec4114ff88aaac93f2ed5c7d799cf9e1bac02..3bca500d099402283a3b8fcadd147e409100c551 100644 (file)
--- a/input/regression/alignment-order.ly
+++ b/input/regression/alignment-order.ly
@@ -3,7 +3,7 @@
 anywhere in the vertical alignment. "
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
 \paper {
   ragged-right = ##t