Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/pgpdump

pgpdump.spec

@@ -1,6 +1,6 @@
 Name:           pgpdump
 Version:        0.33
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PGP packet visualizer
 License:        MIT
 URL:            http://www.mew.org/~kazu/proj/pgpdump/
@@ -30,9 +30,13 @@ OpenPGP (RFC 4880) and PGP version 2 (RFC 1991).
 %{_mandir}/man1/pgpdump.1*
 
 %changelog
-* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-2
+<<<<<<< HEAD
+* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-3
 - Rebuild to fix FTBFS
 
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Jul 9 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-1
 - Update to 0.33