1 changed files with 0 additions and 1 deletions
--- a/libpq.spec
+++ b/libpq.spec
@ -148,7 +148,6 @@ find_lang_bins %name-devel.lst  pg_config
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 11.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

->>>>>>> master
 * Tue Jul 09 2019 Petr Kubat <pkubat@redhat.com> - 11.4-1
 - New upstream version 11.4