resolve merge

[lilypond.git] / input / regression / warn-unterminated-span-dynamic.ly

diff --git a/input/regression/warn-unterminated-span-dynamic.ly b/input/regression/warn-unterminated-span-dynamic.ly
index 88c35b2840d46ab80a0880abba3438b010508ffd..fd53599ffbcc6c2eebabf23395b6015c088027c4 100644 (file)
--- a/input/regression/warn-unterminated-span-dynamic.ly
+++ b/input/regression/warn-unterminated-span-dynamic.ly
@@ -1,4 +1,6 @@
-\version "2.12.3"
+\version "2.14.0"
+
+#(ly:set-option 'warning-as-error #f)
 
 \header {
   texidoc = "A warning is printed if a dynamic spanner is