resolve merge

[lilypond.git] / input / regression / non-empty-text.ly

diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index 6e19ca830731d15e87872ba86ed628e18b11b619..e19bec8e79ce250c8fe72897593949aad0797f80 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header{
   texidoc = "By default, text is set with empty horizontal dimensions.