resolve merge

[lilypond.git] / input / regression / hairpin-circled.ly

diff --git a/input/regression/hairpin-circled.ly b/input/regression/hairpin-circled.ly
index e01f244d75415e24ed740e51a651954235bad75a..f50d02653f7b704f25f12826c8f495ea9332d5b3 100644 (file)
--- a/input/regression/hairpin-circled.ly
+++ b/input/regression/hairpin-circled.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
 
@@ -10,10 +10,12 @@ followed by a crescendo al niente should only print one circle."
 \layout { ragged-right = ##t } 
 
 \relative c'' {
-       \override Hairpin #'circled-tip = ##t
-       c1\< d\! d\> c\! e\> c\< d\! \break
-       c\< \break
-       e d\! c\> \break
-       e d\!
+  \override Hairpin #'circled-tip = ##t
+  c1\< d\! d\> c\!
+  \override Hairpin #'to-barline = ##f
+  e\> c\< d\! \break
+  c\< \break
+  e d\! c\> \break
+  e d\!
 }