resolve merge

[lilypond.git] / input / regression / clef-warn.ly

diff --git a/input/regression/clef-warn.ly b/input/regression/clef-warn.ly
index 5f3b410e9d131896f8dab68d12cdcffa4f424539..425f4a4fa5885aa4051fe8e9a45e36224400539e 100644 (file)
--- a/input/regression/clef-warn.ly
+++ b/input/regression/clef-warn.ly
@@ -1,10 +1,12 @@
+\version "2.14.0"
+
+#(ly:set-option 'warning-as-error #f)
+
 \header {
   texidoc = "Unknown clef name warning displays available clefs"
-  }
-
+}
 
-\version "2.12.0"
 {
   \clef "foo"
   c4
-  }
+}