[rpms/perl-Fsdb] epel10: fix conflict in changelog

[rpms/perl-Fsdb] epel10: fix conflict in changelog

[John Heidemann]

A new commit has been pushed.

Repo   : rpms/perl-Fsdb
Branch : epel10
Commit : 34118264ad10a3abc3db7a6380bd5bb0c74437bf
Author : John Heidemann <johnh@isi.edu>
Date   : 2019-07-10T10:49:16-07:00
Stats  : +0/-18 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/perl-Fsdb/c/34118264ad10a3abc3db7a6380bd5bb0c74437bf?branch=epel10

Log:
fix conflict in changelog

---
diff --git a/perl-Fsdb.spec b/perl-Fsdb.spec
index 7997a24..40bf0c8 100644
--- a/perl-Fsdb.spec
+++ b/perl-Fsdb.spec
@@ -105,23 +105,5 @@ make test
 
 
 %changelog
-<<<<<<< HEAD
 * Wed Jul 10 2019 John Heidemann <johnh@isi.edu> 2.67-1
-=======
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.66-3
-- Perl 5.30 rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.66-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 20 2018 John Heidemann <johnh@isi.edu> 2.66-1
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.65-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.65-2
-- Perl 5.28 rebuild
-
-* Fri Feb 16 2018 John Heidemann <johnh@isi.edu> 2.65-1
->>>>>>> 7688bc9f227ecbb25474040bf66965b70f7de723
 - See http://www.isi.edu/~johnh/SOFTWARE/FSDB/