Don't demand subnet, when ip

[kamaki] / version

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