public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pam_url] epel10: Fix bad merge
@ 2026-06-13 18:25 Konstantin Ryabitsev
0 siblings, 0 replies; only message in thread
From: Konstantin Ryabitsev @ 2026-06-13 18:25 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/pam_url
Branch : epel10
Commit : a65392f50b6f50d803af61fe22ec147333896cb5
Author : Konstantin Ryabitsev <mricon@kernel.org>
Date : 2013-11-18T17:23:20-05:00
Stats : +0/-1 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/pam_url/c/a65392f50b6f50d803af61fe22ec147333896cb5?branch=epel10
Log:
Fix bad merge
---
diff --git a/pam_url.spec b/pam_url.spec
index ffa492e..f793365 100644
--- a/pam_url.spec
+++ b/pam_url.spec
@@ -31,7 +31,6 @@ make DESTDIR=%{buildroot} pamlib=%{_lib}/security install
%changelog
-<<<<<<< HEAD
* Mon Nov 18 2013 Konstantin Ryabitsev <icon@fedoraproject.org> - 1:0.3.3-1
- Upstream 0.3.3 with minor new features.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-13 18:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-13 18:25 [rpms/pam_url] epel10: Fix bad merge Konstantin Ryabitsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox