From: SoonKyu Park <sk7.park@samsung.com>
Date: Mon, 11 Apr 2016 07:35:26 +0000 (+0900)
Subject: Handle conflicts from git merge release-20160315
X-Git-Tag: accepted/tools/devbase/tools/legacy/20240423.040735
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c09be6f787ea6690d80490a10ca076e3e9c05b35;p=tools%2Fpython-nose.git

Handle conflicts from git merge release-20160315

Change-Id: Icf86c49016177c41bc571c88a1f78f8238d698e2
---

4cd7d081275587835515bc22682f676fea864e81