resolve merge

[lilypond.git] / input / regression / quote-during.ly

diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly
index 225bf6ebdda1899a852d48d470c6bd2de35c9dfd..3abc0eb6338a989b33136cde65e3b9fc56356106 100644 (file)
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -8,7 +8,7 @@ quoted. In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.12.0"
+\version "2.14.0"
 \layout {
     ragged-right = ##t
 }
@@ -32,7 +32,9 @@ original = \relative c'' { c8 d s2 es8 gis8 }
        
        \set Staff.instrumentName = "orig+quote"        
        \set Staff.quotedEventTypes = #'(note-event articulation-event)
-       \original
+       \new Voice {
+           \override Voice . Beam #'collision-voice-only = ##t
+           \original }
        { s4 \quoteDuring #"quoteMe" { s2. } }
     >>
 >>