Fix mistake in spec

7 years ago · 7726e2c9ef
parent 3b9693d73c
commit 7726e2c9ef
1 changed files with 0 additions and 1 deletions
--- 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