resolve merge

[lilypond.git] / input / regression / fret-diagram-origins.ly

diff --git a/input/regression/fret-diagram-origins.ly b/input/regression/fret-diagram-origins.ly
index 4042bf5ddd957a263f628a22c2b985968e37dc0e..b8d0f135a0cc51474587d49042961386dcd53302 100644 (file)
--- a/input/regression/fret-diagram-origins.ly
+++ b/input/regression/fret-diagram-origins.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
   texidoc="