resolve merge

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

diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index 07c48656ef2ab15f73beddf5b28a2af14c27d1e4..b41bb93225ceac9cd4e3116112620468450c5854 100644 (file)
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 \header
 {
   texidoc ="Slurs may be placed over rests. The slur will avoid