resolve merge

[lilypond.git] / input / regression / collision-head-chords.ly

diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 248e6748092d7677d204bc2609e9e167d50f896d..86ef4053ad2b1560854f5e867aba9aacf35ebb4c 100644 (file)
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {
   texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.