Handle conflicts from git merge release-20160315 release-20160411
authorSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 04:21:01 +0000 (13:21 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 04:21:01 +0000 (13:21 +0900)
commit8e7c90b9ae69aad55495a8f5be4e94b498052166
tree214b01911f079ba147da9ddb48449ad75842e2f0
parent96398c46398eec541b59df3997e5b8b2a392ee56
parent8456b886b0fcd8ce465c3e3c44b47beeaf436afb
Handle conflicts from git merge release-20160315
debian/control
gbp/scripts/buildpackage_rpm.py