resolve merge

[lilypond.git] / input / regression / harp-pedals.ly

diff --git a/input/regression/harp-pedals.ly b/input/regression/harp-pedals.ly
index 7f19767e21fbe08a275a08baeffbf4cc83b883d0..e7e1c1c7d63b2df68226393c9b80dcb1c1772fbb 100644 (file)
--- a/input/regression/harp-pedals.ly
+++ b/input/regression/harp-pedals.ly
@@ -1,4 +1,6 @@
-\version "2.12.0"
+\version "2.14.0"
+
+#(ly:set-option 'warning-as-error #f)
 
 \header {
   texidoc = "Basic harp diagram functionality, including circled pedal boxes.