CG merge duplicated sections about conflicts and branches

[lilypond.git] / VERSION

diff --git a/VERSION b/VERSION
index a83b5636ca98b5df29dbe86e67594874841240b3..ba6f53a35c8f63d72ee9d3d78e858ecce7ce2e47 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
-MINOR_VERSION=17
-PATCH_LEVEL=26
+MINOR_VERSION=19
+PATCH_LEVEL=0
 MY_PATCH_LEVEL=
-VERSION_STABLE=2.16.2
-VERSION_DEVEL=2.17.26
+VERSION_STABLE=2.18.0
+VERSION_DEVEL=2.17.97