resolve merge

[lilypond.git] / input / regression / generic-output-property.ly

diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index da8c41ff397168f89522dcbcc5c44cf36b9edb95..b5b3b260257081847d8c94e84eb402fc963c8c98 100644 (file)
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 
 \header{
   texidoc="