From c71f38be5b64a8d79f3f13a9be8379e9312d481d Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Thu, 18 Jul 2013 11:27:19 +0300
Subject: [PATCH] Bump version to 0.4.3next
---
image_creator/version.py | 10 +++++-----
version | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/image_creator/version.py b/image_creator/version.py
index 2026ff2..f58201b 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 17b2ccd..9066278 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4.3
+0.4.3next
--
GitLab