resolve merge

[lilypond.git] / input / regression / rest-collision-beam-quantized.ly

diff --git a/input/regression/rest-collision-beam-quantized.ly b/input/regression/rest-collision-beam-quantized.ly
index 0200d38c64f0d3819a6dcb1f03979cd7b802dbc4..3cdf960408b18fea5c08fed43063ce4583f9417a 100644 (file)
--- a/input/regression/rest-collision-beam-quantized.ly
+++ b/input/regression/rest-collision-beam-quantized.ly
@@ -6,7 +6,7 @@
   ragged-right = ##t
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
 fig =   \relative c' {
   <a c e>8[