resolve merge

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

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 11387aecf33893a8366b58a039097f31e54cf444..1a0a9fba83ee3708cb7960ccf96bd299ddc198ad 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 \header {
   texidoc =
   "Open and black note heads are not merged by default."