diff options
| author | SoonKyu Park <sk7.park@samsung.com> | 2016-06-16 17:32:15 +0900 |
|---|---|---|
| committer | SoonKyu Park <sk7.park@samsung.com> | 2016-06-16 17:32:15 +0900 |
| commit | 06e10c8b1f4f355e884d52a61b7762e733975d55 (patch) | |
| tree | d16f1113bd5460842228e1b7e75ff38deb438163 /gbp/rpm/__init__.py | |
| parent | 8e7c90b9ae69aad55495a8f5be4e94b498052166 (diff) | |
| parent | 7d042a8203461117e8743bf1e879af431d3c31cd (diff) | |
| download | git-buildpackage-06e10c8b1f4f355e884d52a61b7762e733975d55.tar.gz git-buildpackage-06e10c8b1f4f355e884d52a61b7762e733975d55.tar.bz2 git-buildpackage-06e10c8b1f4f355e884d52a61b7762e733975d55.zip | |
Handle conflicts from git merge release-20160531release-20160930release-20160615
Change-Id: I1cae90068ab2576d756188e36e112550c7c293de
Diffstat (limited to 'gbp/rpm/__init__.py')
| -rw-r--r-- | gbp/rpm/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py index 4c5c22bf..d5fa1ee8 100644 --- a/gbp/rpm/__init__.py +++ b/gbp/rpm/__init__.py @@ -901,5 +901,4 @@ def string_to_int(val_str): else: return int(val_str) - # vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: |