resolve merge

[lilypond.git] / ly / makam.ly

diff --git a/ly/makam.ly b/ly/makam.ly
index c7f793d267754a244fb0776539d256105d01cf30..37b66298bdd2886a3ae80849efca5e9ec3be37fa 100644 (file)
--- a/ly/makam.ly
+++ b/ly/makam.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 %{