diff options
author | SoonKyu Park <sk7.park@samsung.com> | 2016-07-25 20:53:31 +0900 |
---|---|---|
committer | SoonKyu Park <sk7.park@samsung.com> | 2016-07-25 20:53:31 +0900 |
commit | 77958da8a32b9f39356684e05842579a74c4a46f (patch) | |
tree | b4babcbfce543e21abfa2fb09049d546cb049481 /.coveragerc | |
parent | 31a52b28de3581b2859fd020a0d221d54d8e57f7 (diff) | |
parent | 06e10c8b1f4f355e884d52a61b7762e733975d55 (diff) | |
download | git-buildpackage-devel_psk_20160727.tar.gz git-buildpackage-devel_psk_20160727.tar.bz2 git-buildpackage-devel_psk_20160727.zip |
Handle conflicts from git merge masterdevel_psk_20160727
Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1
Diffstat (limited to '.coveragerc')
0 files changed, 0 insertions, 0 deletions