From d0a89abdd61129658947254aaea6ce66b0531c21 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Mon, 20 Jan 2020 15:04:38 +0100 Subject: [PATCH] Fix the specfile --- boom-boot.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/boom-boot.spec b/boom-boot.spec index 0879501..3641ad0 100644 --- a/boom-boot.spec +++ b/boom-boot.spec @@ -3,11 +3,7 @@ Name: boom-boot Version: 1.0 -<<<<<<< HEAD -Release: 0.5.20190329git%{shortcommit}%{?dist} -======= Release: 1%{?dist} ->>>>>>> New release 1.0 Summary: %{summary} License: GPLv2 @@ -165,7 +161,7 @@ rm doc/conf.py %changelog -* Tue Dec 03 2019 Marian Csontos 1.0-1 +* Mon Jan 20 2020 Marian Csontos 1.0-1 - Update to new upstream release 1.0. * Thu Oct 03 2019 Miro HronĨok - 1.0-0.5.20190329git6ff3e08