Resolve conflict

[lilypond.git] / input / regression / lyrics-bar.ly

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index a6a1afab9e7ee30ac314b948a524ac9ec3de8443..2f60761fa00e266bb0d440564d2e30c027cf4272 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.51"
 
 \header{
 texidoc="