public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/perl-Fsdb] epel10: resolve another commit conflict
@ 2026-06-09 17:51 John Heidemann
0 siblings, 0 replies; only message in thread
From: John Heidemann @ 2026-06-09 17:51 UTC (permalink / raw)
To: git-commits
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,-)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-09 17:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-09 17:51 [rpms/perl-Fsdb] epel10: resolve another commit conflict John Heidemann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox