Handle conflicts from git merge master

author SoonKyu Park <sk7.park@samsung.com>

Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)

committer SoonKyu Park <sk7.park@samsung.com>

Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
author SoonKyu Park <sk7.park@samsung.com>
Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
committer SoonKyu Park <sk7.park@samsung.com>
Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
diff --cc debian/changelog

index bbd64ed,581544d..581544d

mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
diff --cc debian/control

index 3bae388,e5c828c..e5c828c

mode 100755,100644..100755
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
diff --cc gbp/scripts/buildpackage_rpm.py
Simple merge
diff --cc packaging/git-buildpackage.changes

index 5f8ecf5,7f8a5ef..7f8a5ef

mode 100755,100644..100755
--- 1/packaging/git-buildpackage.changes
--- 2/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
diff --cc packaging/git-buildpackage.spec

index bc6c190,6093960..6093960

mode 100755,100644..100755
--- 1/packaging/git-buildpackage.spec
--- 2/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
author	SoonKyu Park <sk7.park@samsung.com>
	Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
committer	SoonKyu Park <sk7.park@samsung.com>
	Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
		1	2
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
gbp/scripts/buildpackage_rpm.py	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/git-buildpackage.changes	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/git-buildpackage.spec	patch \|	diff1 \|	diff2 \|	blob \| history