resolve merge

[lilypond.git] / input / regression / grace-bar-number.ly

diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index c1771d8739007cfdc0ab8acf7033c46917cd8a79..f557eadc558abc7ee2cf0624fba835a06a1746df 100644 (file)
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header {
 
   texidoc = "Grace notes do tricky things with timing. If a measure