resolve merge

[lilypond.git] / input / regression / property-grace-polyphony.ly

diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly
index 50125f2f6f9bbff88c49329013bf9a4b9b8f2106..2fa8ffaaf6d2a8c24c76b1ed2f035b9fb82031a0 100644 (file)
--- a/input/regression/property-grace-polyphony.ly
+++ b/input/regression/property-grace-polyphony.ly
@@ -7,7 +7,7 @@
 }
 \layout { ragged-right = ##t }
 
-\version "2.12.0"
+\version "2.14.0"
    \relative c'' {
       <<
          { \grace e8 d2 }