public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: John Heidemann <johnh@isi.edu>
To: git-commits@fedoraproject.org
Subject: [rpms/perl-Fsdb] epel10: fix conflict in changelog
Date: Tue, 09 Jun 2026 17:51:42 GMT [thread overview]
Message-ID: <178102750208.1.14796252858671934236.rpms-perl-Fsdb-34118264ad10@fedoraproject.org> (raw)
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/
reply other threads:[~2026-06-09 17:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178102750208.1.14796252858671934236.rpms-perl-Fsdb-34118264ad10@fedoraproject.org \
--to=johnh@isi.edu \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox