merge conflig file cleanups from PR

This commit is contained in:
Tom Callaway 2019-07-11 17:11:21 -04:00
parent f7f6955004
commit 0a2d485000

View File

@ -20,7 +20,7 @@
Name: rpmlint
Version: 1.11
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Tool for checking common errors in RPM packages
License: GPLv2
URL: https://github.com/rpm-software-management/rpmlint
@ -148,6 +148,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
%{_mandir}/man1/rpmlint.1*
%changelog
* Thu Jul 11 2019 Tom Callaway <spot@fedoraproject.org> - 1.11-2
- merge conflig file cleanups from PR
* Fri Jun 21 2019 Tom Callaway <spot@fedoraproject.org> - 1.11-1
- update to 1.11