resolve merge

[lilypond.git] / input / regression / newaddlyrics.ly

diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly
index 7b455e74f8e7adf133272a77edb68c54aaaecae1..fcadd2abe405af2be32c4793306421ab000d3f43 100644 (file)
--- a/input/regression/newaddlyrics.ly
+++ b/input/regression/newaddlyrics.ly
@@ -1,12 +1,12 @@
 \header {
-    
+
     texidoc = "newlyrics, multiple stanzas, multiple lyric voices."
-    
+
 }
 \layout { ragged-right = ##t }
 <<
-    \new Staff \relative {
-       d'2 d c4 bes a2 \break
+    \new Staff \relative c'' {
+       d2 d c4 bes a2 \break
     }
     \addlyrics {
        My first Li -- ly song,
@@ -14,7 +14,7 @@
     \addlyrics {
        Not much can go wrong!
     }
-    \new Staff \relative {
+    \new Staff \relative c' {
        \clef bass
        d2 d c4 bes a2 \break
     }
@@ -26,4 +26,4 @@
     }
 >>
 
-\version "2.12.0"
+\version "2.14.0"