resolve merge

[lilypond.git] / input / regression / lyrics-tenor-clef.ly

diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly
index bc1f016967bc3fd3e6e52d7e42228c3da5b9c982..3d916d89bcac239043da613b694353353688da37 100644 (file)
--- a/input/regression/lyrics-tenor-clef.ly
+++ b/input/regression/lyrics-tenor-clef.ly
@@ -2,18 +2,11 @@
     texidoc = "Lyrics are not lowered despite the presence of an octavation 8."
 }
 
-\version "2.12.0"
-\layout {
-    \context {
-       \Staff
-       \override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
-    \context {
-       \Lyrics
-       \override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
-    ragged-right = ##t
+\version "2.14.0"
+
+\paper {
+  ragged-right = ##t
 }
 
-\relative { \clef "G_8" c c c c }
+\relative c' { \clef "G_8" c c c c }
 \addlyrics { bla bla bla bla }