correct changelog tag

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2020-12-03 13:24:09 -05:00
parent c996c1964d
commit 6cba1e5efe

View File

@ -56,11 +56,7 @@ Version: 3.0.0
# N.foo if released, 0.N.foo if unreleased
# Rawhide almost always ships unreleased builds,
# so release tag should be of the form 0.N.foo
<<<<<<< HEAD
Release: 0.18.dev.git%{shortcommit0}%{?dist}
=======
Release: 0.17.dev.git%{shortcommit0}%{?dist}
>>>>>>> be7c5c2 (podman-2:3.0.0-0.17.dev.git85b412d)
Release: 0.19.dev.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
URL: https://%{name}.io/
@ -631,7 +627,7 @@ exit 0
# rhcontainerbot account currently managed by lsm5
%changelog
* Thu Dec 3 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:3.0.0-0.17.dev.git85b412d
* Thu Dec 3 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:3.0.0-0.19.dev.git85b412d
- Harden binaries
- Reported-by: Wade Mealing <wmealing@gmail.com>