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: resolve another commit conflict
Date: Tue, 09 Jun 2026 17:51:42 GMT [thread overview]
Message-ID: <178102750250.1.2446512081947702694.rpms-perl-Fsdb-9ebd0b983695@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/perl-Fsdb
Branch : epel10
Commit : 9ebd0b983695a64237d35458e6ecaef993691877
Author : John Heidemann <johnh@isi.edu>
Date : 2019-07-10T11:30:20-07:00
Stats : +0/-4 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/perl-Fsdb/c/9ebd0b983695a64237d35458e6ecaef993691877?branch=epel10
Log:
resolve another commit conflict
---
diff --git a/perl-Fsdb.spec b/perl-Fsdb.spec
index 40bf0c8..8c417f3 100644
--- a/perl-Fsdb.spec
+++ b/perl-Fsdb.spec
@@ -88,10 +88,6 @@ find $RPM_BUILD_ROOT -type d -exec chmod g-s {} ';'
%check
make test
-<<<<<<< HEAD
-
-=======
->>>>>>> 7688bc9f227ecbb25474040bf66965b70f7de723
%files
# next line deprecated since rpm 4.4, I'm told.
# -was-percent-defattr(-,root,root,-)
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=178102750250.1.2446512081947702694.rpms-perl-Fsdb-9ebd0b983695@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