From: SoonKyu Park <sk7.park@samsung.com>
Date: Mon, 25 Jul 2016 11:53:31 +0000 (+0900)
Subject: Handle conflicts from git merge master
X-Git-Tag: debian/0.9.9~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77958da8a32b9f39356684e05842579a74c4a46f;p=tools%2Fgit-buildpackage.git

Handle conflicts from git merge master

Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1
---

77958da8a32b9f39356684e05842579a74c4a46f
diff --cc debian/changelog
index bbd64edb,581544d6..581544d6
mode 100755,100644..100755
--- a/debian/changelog
+++ b/debian/changelog
diff --cc debian/control
index 3bae3887,e5c828c9..e5c828c9
mode 100755,100644..100755
--- a/debian/control
+++ b/debian/control
diff --cc packaging/git-buildpackage.changes
index 5f8ecf55,7f8a5ef3..7f8a5ef3
mode 100755,100644..100755
--- a/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
diff --cc packaging/git-buildpackage.spec
index bc6c190f,60939602..60939602
mode 100755,100644..100755
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec