Resolve conflict

[lilypond.git] / input / regression / system-overstrike.ly

diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly
index 7f04ec803e6b017afcd1db09b6ab64387397183a..0bfda8f3121f51a5d5fb3f8c1afe8dd116fcdb5e 100644 (file)
--- a/input/regression/system-overstrike.ly
+++ b/input/regression/system-overstrike.ly
@@ -1,4 +1,4 @@
-\version "2.7.32"
+\version "2.11.51"
 \header { texidoc = "By setting between-system-padding to a negative
 value, it is possible to eliminate the anti-collision constraints.
 Then  setting @code{between-system-space} to a low (nonzero) value,