resolve merge

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 1b98c177cf090b0015dff48864d626c055fece33..884c059dc021273c92bb0223d2e4ed00a66e72b1 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header{
   texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may