resolve merge

[lilypond.git] / input / regression / spacing-non-adjacent-columns1.ly

diff --git a/input/regression/spacing-non-adjacent-columns1.ly b/input/regression/spacing-non-adjacent-columns1.ly
index 8176f2416a619c65846dc70061242aed37a9b0eb..2acaa15909eed5c16c67881a56a3c427498766a0 100644 (file)
--- a/input/regression/spacing-non-adjacent-columns1.ly
+++ b/input/regression/spacing-non-adjacent-columns1.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \paper {ragged-right = ##t}
 \header {
   texidoc = "The spacing engine avoids collisions between non-adjacent columns."