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 /tests/component/rpm/data | |
| parent | 31a52b28de3581b2859fd020a0d221d54d8e57f7 (diff) | |
| parent | 06e10c8b1f4f355e884d52a61b7762e733975d55 (diff) | |
| download | git-buildpackage-77958da8a32b9f39356684e05842579a74c4a46f.tar.gz git-buildpackage-77958da8a32b9f39356684e05842579a74c4a46f.tar.bz2 git-buildpackage-77958da8a32b9f39356684e05842579a74c4a46f.zip | |
Handle conflicts from git merge masterdevel_psk_20160727
Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1
Diffstat (limited to 'tests/component/rpm/data')
| m--------- | tests/component/rpm/data | 0 | ||||
| -rw-r--r-- | tests/component/rpm/data/.keep | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/component/rpm/data b/tests/component/rpm/data deleted file mode 160000 -Subproject ff090c1cf946e3df67795ce3c1437ec6246dbf3 diff --git a/tests/component/rpm/data/.keep b/tests/component/rpm/data/.keep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/tests/component/rpm/data/.keep |