From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Mon, 20 Aug 2012 14:06:47 +0000 (+0800)
Subject: fix merge conflict issue from release-0.9 branch to devel
X-Git-Tag: 0.10~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bf3e4ea98e0196304515a037e098432bf76c0ed;p=tools%2Fgbs.git

fix merge conflict issue from release-0.9 branch to devel
---

6bf3e4ea98e0196304515a037e098432bf76c0ed
diff --cc gitbuildsys/__init__.py
index 59dad89,d1433f5..64dbb97
--- a/gitbuildsys/__init__.py
+++ b/gitbuildsys/__init__.py
@@@ -20,4 -20,3 +20,4 @@@
  module for gbs tool
  """
  
- __version__ = "0.8.1"
++__version__ = "0.9"