resolve merge

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

diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly
index d55017c09dbe887907d86eddf3f0b59c7f3224ab..492182acab0f62de6acea86b3313b4045d5b4bad 100644 (file)
--- a/input/regression/quote-cyclic.ly
+++ b/input/regression/quote-cyclic.ly
@@ -1,22 +1,17 @@
+\version "2.14.0"
 
 \header {
-
-    texidoc = "Two quoted voices may refer to each other. In this
+  texidoc = "Two quoted voices may refer to each other. In this
 example, there are notes with each full-bar rest."
-         
- 
 }
-\version "2.12.0"
 
 A = \relative c' { c4 d e f | \cueDuring #"qB" #1 { R1 } | }
-B = \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c  | }
+B = \new Voice \relative c' { \cueDuring #"qA" #1 { R1 } | f4 e d c | }
 
 \addQuote "qA" \A
 \addQuote "qB" \B
 
-\layout { ragged-right = ##t }
-
 <<
-    \new Staff \A
-    \new Staff \B
+  \new Staff \A
+  \new Staff \B
 >>