resolve merge

[lilypond.git] / input / regression / beam-quarter.ly

diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index ac1d57819d9daedacf59e06f2f01332fd7a3f1ec..fb5c4359cfb01e73213d5780f3340d5709803b05 100644 (file)
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -1,12 +1,11 @@
+\version "2.14.0"
 
-\version "2.12.0"
-\header
-{
+#(ly:set-option 'warning-as-error #f)
+
+\header {
   texidoc= "Quarter notes may be beamed: the beam is halted momentarily."
 }
 
-\layout { ragged-right = ##t }
-
 \relative c'' {
   c8[ c4 c8] % should warn here!
 }