resolve merge

[lilypond.git] / input / regression / beam-cross-staff-script.ly

diff --git a/input/regression/beam-cross-staff-script.ly b/input/regression/beam-cross-staff-script.ly
index 772075495bdc2d0cc42759b36bc3aaf9741dbece..357f58e8b6bc55de3c1763ec9f0e45026e1c0f0a 100644 (file)
--- a/input/regression/beam-cross-staff-script.ly
+++ b/input/regression/beam-cross-staff-script.ly
@@ -7,7 +7,7 @@ staves."
 }
 
 
-\version "2.12.0"
+\version "2.14.0"
 
 \new PianoStaff <<
    \new Staff = RH {