resolve merge

[lilypond.git] / input / regression / slur-tuplet.ly

diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly
index eb5bae7aea98f7a8f89f9a8219dfafdc5dabf1b2..0f2e8e2755731cf9d94c8410398f258a429b11d8 100644 (file)
--- a/input/regression/slur-tuplet.ly
+++ b/input/regression/slur-tuplet.ly
@@ -5,14 +5,14 @@ This may not work if the slur starts after the tuplet.  "
   
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
 \paper {
   ragged-right = ##t
 %  #(define debug-slur-scoring #t)
 }
 
-\relative {
+\relative c' {
   \slurUp
   \override TupletBracket #'bracket-visibility = ##f
   \override Slur #'(details region-size)  = #6