diff --git a/image_creator/version.py b/image_creator/version.py index 2026ff211015e6d2c1934f5bc913148ca76f160f..f58201b3c656f898c533d82fbe17699051e1a761 100644 --- a/image_creator/version.py +++ b/image_creator/version.py @@ -1,8 +1,8 @@ -__version__ = "0.4.3" + +__version__ = "0.4.3next" __version_vcs_info__ = { - 'branch': 'master', - 'revid': '9f0e45e', - 'revno': 319} ->>>>>>> master + 'branch': 'develop', + 'revid': '64556e6', + 'revno': 330} __version_user_email__ = "skalkoto@grnet.gr" __version_user_name__ = "Nikos Skalkotos" diff --git a/version b/version index 17b2ccd9bf9050efdf57d7800677e87919b9b5b9..906627836055f9006c4b5e247cc235aba04bb4a3 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.4.3 +0.4.3next