resolve merge

[lilypond.git] / input / regression / collision-manual.ly

diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly
index 7acb4befbc2833d2da95bcbed646d88b8f80aafe..e8ce7b8124546127a0a22d5d166fdac88257cfeb 100644 (file)
--- a/input/regression/collision-manual.ly
+++ b/input/regression/collision-manual.ly
@@ -2,13 +2,13 @@
 
   texidoc = "Collision resolution may be forced manually with @code{force-hshift}. "
 }
-\version "2.12.0"
+\version "2.14.0"
 
 \paper  {
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   << {  f
        \override NoteColumn #'force-hshift = #0.1
        f } \\