resolve merge

[lilypond.git] / input / regression / multi-measure-rest-instr-name.ly

diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 5dc425dc9e559c38874c0b443730a456c3a84b47..08ce7ab16b9107cf4e14c52dfc5da2024972b336 100644 (file)
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.14.0"
 \header {
 
   texidoc = "There are both long and short instrument names.