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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -18,10 +18,10 @@ docs/manpage.links docs/manpage.refs docs/version.ent -debian/git-buildpackage*.debhelper* +debian/git-buildpackage.*.debhelper +debian/git-buildpackage.debhelper.* debian/python-module-stampdir/ debian/files -debian/git-buildpackage*.substvars +debian/git-buildpackage.substvars debian/git-buildpackage/ -debian/git-buildpackage-rpm/ -debian/tmp/ + |