resolve merge

[lilypond.git] / input / regression / grace-nest2.ly

diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly
index 3c1bba2567dc5bb1c7f2ef5c6b79a6eb5286795b..855d5bdfef599cd5d26c95596df188251fd63cf5 100644 (file)
--- a/input/regression/grace-nest2.ly
+++ b/input/regression/grace-nest2.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {
   texidoc = "Grace code should not be confused by nested sequential music containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example."