projects / kamaki / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Finetest Cyclades.get_server_console
[kamaki] / version
diff --git a/version b/version
index 4b7e8b5..c17c572 100644 (file)
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 0.7next
-=======
-0.7.1
->>>>>>> hotfix-0.7.1
Kamaki