public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Konstantin Ryabitsev <mricon@kernel.org>
To: git-commits@fedoraproject.org
Subject: [rpms/pam_url] epel10: Fix bad merge
Date: Sat, 13 Jun 2026 18:25:06 GMT [thread overview]
Message-ID: <178137510650.1.4819150304701382738.rpms-pam_url-a65392f50b6f@fedoraproject.org> (raw)
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.
reply other threads:[~2026-06-13 18:25 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=178137510650.1.4819150304701382738.rpms-pam_url-a65392f50b6f@fedoraproject.org \
--to=mricon@kernel.org \
--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