resolve merge

[lilypond.git] / input / regression / part-combine-solo-end.ly

diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly
index 63c1318910b6761b314009629b9bdf81726d699e..6e6feb9e8a54c78fb44922c67bc11e05e0312b04 100644 (file)
--- a/input/regression/part-combine-solo-end.ly
+++ b/input/regression/part-combine-solo-end.ly
@@ -6,7 +6,7 @@
 
 }
 
-\version "2.12.0"
+\version "2.14.0"
 \layout { ragged-right = ##t }
 
 <<