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/test_rpm_data/specs/gbp-test-native.spec | |
| 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/test_rpm_data/specs/gbp-test-native.spec')
| l--------- | tests/test_rpm_data/specs/gbp-test-native.spec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/test_rpm_data/specs/gbp-test-native.spec b/tests/test_rpm_data/specs/gbp-test-native.spec new file mode 120000 index 00000000..60de36f2 --- /dev/null +++ b/tests/test_rpm_data/specs/gbp-test-native.spec @@ -0,0 +1 @@ +../rpmbuild/SPECS/gbp-test-native.spec
\ No newline at end of file |