Update version tag and Changelog

[kamaki] / version

diff --git a/version b/version
index 9e55365..0de787f 100644 (file)
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.7rc3
-=======
-0.7
->>>>>>> develop
+0.12.9