From: SoonKyu Park <sk7.park@samsung.com>
Date: Mon, 11 Apr 2016 04:21:01 +0000 (+0900)
Subject: Handle conflicts from git merge release-20160315
X-Git-Tag: debian/0.7.5~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e7c90b9ae69aad55495a8f5be4e94b498052166;p=tools%2Fgit-buildpackage.git

Handle conflicts from git merge release-20160315
---

8e7c90b9ae69aad55495a8f5be4e94b498052166
diff --cc debian/control
index 856566a1,827c2e16..f8d1a808
--- a/debian/control
+++ b/debian/control
@@@ -16,8 -16,8 +16,9 @@@ Build-Depends
   python-pkg-resources,
   python-setuptools,
   sgml2x,
+  librpm-tizen,
  # For rpm (epydoc)
 + rpm-common,
   python-rpm
  Standards-Version: 3.9.4
  Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git