From 7726e2c9ef1d005057a38daf044b0cb3eca67c8c Mon Sep 17 00:00:00 2001
From: Nick Bebout <nebebout@36WTHB2.usi.edu>
Date: Mon, 23 Jul 2018 09:46:10 -0500
Subject: [PATCH] Fix mistake in spec

---
 pgpdump.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pgpdump.spec b/pgpdump.spec
index ac16af5..e455616 100644
--- a/pgpdump.spec
+++ b/pgpdump.spec
@@ -30,7 +30,6 @@ OpenPGP (RFC 4880) and PGP version 2 (RFC 1991).
 %{_mandir}/man1/pgpdump.1*
 
 %changelog
-<<<<<<< HEAD
 * Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-3
 - Rebuild to fix FTBFS