From 879be783e2b8743a7b2c2cf68567d6a2b3865360 Mon Sep 17 00:00:00 2001
From: Christopher Brown <chribrow@redhat.com>
Date: Sep 07 2021 10:32:33 +0000
Subject: fix changelog date


---

diff --git a/rubygem-asciidoctor-pdf.spec b/rubygem-asciidoctor-pdf.spec
index 950a3ac..47d6eb7 100644
--- a/rubygem-asciidoctor-pdf.spec
+++ b/rubygem-asciidoctor-pdf.spec
@@ -91,15 +91,9 @@ GEM_HOME=/builddir/build/BUILD/%{gem_name}-%{version}/usr/share/gems rspec -t ~n
 %{gem_instdir}/%{gem_name}.gemspec
 
 %changelog
-<<<<<<< HEAD
-=======
-* Mon Sep 6 2020 Christopher Brown <chris.brown@redhat.com> - 1.6.1-1
+* Mon Sep 6 2021 Christopher Brown <chris.brown@redhat.com> - 1.6.1-1
 - Bump to 1.6.1
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
->>>>>>> 88cb4d1 (Bump to 1.6.1)
 * Wed Jun 23 2021 Christopher Brown <chris.brown@redhat.com> - 1.5.4-4
 - Re-add prawn-icon gemspec dep (BZ 1975454)