fix merge errors
authorJun Wang <junbill.wang@samsung.com>
Thu, 28 Jan 2016 14:50:55 +0000 (22:50 +0800)
committerJun Wang <junbill.wang@samsung.com>
Thu, 28 Jan 2016 14:50:55 +0000 (22:50 +0800)
commit27761b16936562b0d6d9ce71de948091b1cf229d
tree1c5569e5228cee837d8d0f2b59be9f9e106b9ad8
parent0eae33b7dff9b06aade2ac401416cb67a368250d
fix merge errors

Change-Id: I4419bb8322f341f92db7e9e19f60ffaa93af2171
bin/git-pbuilder
gbp/pkg/__init__.py
gbp/scripts/common/import_orig.py
gbp/scripts/import_orig.py
gbp/scripts/pq_rpm.py
packaging/git-buildpackage.spec