X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/64556e630fdf69f62ef08bd77f25aa49205f91cc..6b81adfd297f33fc6f0249f792ca1a2e86f825b4:/image_creator/version.py

diff --git a/image_creator/version.py b/image_creator/version.py
index 2026ff2..3158b73 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,8 @@
-__version__ = "0.4.3"
+
+__version__ = "0.5.2next"
 __version_vcs_info__ = {
-    'branch': 'master',
-    'revid': '9f0e45e',
-    'revno': 319}
->>>>>>> master
+    'branch': 'develop',
+    'revid': '694ca1e',
+    'revno': 396}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"