projects / kamaki / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bump version to 0.12-1~squeeze
[kamaki] / version
diff --git a/version b/version
index f329365..c43e105 100644 (file)
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.8.6
-=======
-0.9rc5
->>>>>>> release-0.9
+0.12
Kamaki