From 8a0526f07fa9e5e063846dc6d9abf18dc1ae1ab7 Mon Sep 17 00:00:00 2001
From: Tomas Halman <thalman@redhat.com>
Date: Tue, 17 Aug 2021 16:07:26 +0200
Subject: [PATCH] Fixing broken changelog

Resolves: rhbz#1993633
---
 libuser.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libuser.spec b/libuser.spec
index 90d282e..23ef94b 100644
--- a/libuser.spec
+++ b/libuser.spec
@@ -1,6 +1,6 @@
 Name: libuser
 Version: 0.63
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 URL: https://pagure.io/libuser
 Source: http://releases.pagure.org/libuser/libuser-%{version}.tar.xz
@@ -125,7 +125,6 @@ make
 - Rebuilt for RHEL 9 BETA for openssl 3.0
   Related: rhbz#1971065
 
-<<<<<<< HEAD
 * Thu May 20 2021 Tomas Halman <thalman@redhat.com> 
 - Enable audit library in the build 
 - Resolves: rhbz#1923043 - libuser doesn't audit events around the account lifecycle
@@ -134,8 +133,6 @@ make
 - Renaming python package according to the standard
 - Resolves: rhbz#1951968
 
-=======
->>>>>>> 96fbb4a91a8471e931d872e7b696d176fc351605
 * Wed May 5 2021 Tomas Halman <thalman@redhat.com>
 - Resolves: rhbz#1951601 - Remove fakeroot dependency