resolve merge

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

diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
index 1ec5441eb2f5fd48574df90dd77a8cc4fb997174..1e5dd64a4726ad51f71382c546dc5d7eae83193f 100644 (file)
--- a/input/regression/rest-collision-beam.ly
+++ b/input/regression/rest-collision-beam.ly
@@ -4,7 +4,7 @@
 collision."
 
 }
-\version "2.12.0"
+\version "2.14.0"
 \paper {
   ragged-right = ##t
 }