resolve merge

[lilypond.git] / ly / scale-definitions-init.ly

diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly
index 450092024944478d429e4f9701c4c2b91a5c16e5..712be245bdf31ae8ee7ad663c676e069e0d7bf66 100644 (file)
--- a/ly/scale-definitions-init.ly
+++ b/ly/scale-definitions-init.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 
 major = #`(