Resolve conflict

[lilypond.git] / input / regression / lyric-combine.ly

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index dd8ec91e2debf4ab6d11e098e18ce6110300e705..1f35e71167c5ad7ff3d32424f22daa64f44751bc 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.11.38"
+\version "2.11.51"
 
 \header{