From 6cba1e5efe28cb0dfcb6d5ebe06e452b2d3d1518 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Dec 2020 13:24:09 -0500 Subject: [PATCH] correct changelog tag Signed-off-by: Lokesh Mandvekar --- podman.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/podman.spec b/podman.spec index 0ece946..3318b58 100644 --- a/podman.spec +++ b/podman.spec @@ -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 - 2:3.0.0-0.17.dev.git85b412d +* Thu Dec 3 2020 Lokesh Mandvekar - 2:3.0.0-0.19.dev.git85b412d - Harden binaries - Reported-by: Wade Mealing