resolve merge

[lilypond.git] / input / regression / stencil-hacking.ly

diff --git a/input/regression/stencil-hacking.ly b/input/regression/stencil-hacking.ly
index b95fffb857b9f7c44ad65c8ed07f38299097b309..304c3461df1e7dcdcda8a7fd2bc7448263690f19 100644 (file)
--- a/input/regression/stencil-hacking.ly
+++ b/input/regression/stencil-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.14.0"
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is