public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Nick Bebout <nebebout@36WTHB2.usi.edu>
To: git-commits@fedoraproject.org
Subject: [rpms/pgpdump] epel10: Fix mistake in spec
Date: Sun, 09 Aug 2026 03:09:04 GMT	[thread overview]
Message-ID: <178624494468.1.12752354240773595577.rpms-pgpdump-7726e2c9ef1d@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/pgpdump
Branch : epel10
Commit : 7726e2c9ef1d005057a38daf044b0cb3eca67c8c
Author : Nick Bebout <nebebout@36WTHB2.usi.edu>
Date   : 2018-07-23T09:46:10-05:00
Stats  : +0/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/pgpdump/c/7726e2c9ef1d005057a38daf044b0cb3eca67c8c?branch=epel10

Log:
Fix mistake in spec

---
diff --git a/pgpdump.spec b/pgpdump.spec
index ac16af5..e455616 100644
--- a/pgpdump.spec
+++ b/pgpdump.spec
@@ -30,7 +30,6 @@ OpenPGP (RFC 4880) and PGP version 2 (RFC 1991).
 %{_mandir}/man1/pgpdump.1*
 
 %changelog
-<<<<<<< HEAD
 * Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-3
 - Rebuild to fix FTBFS
 

                 reply	other threads:[~2026-08-09  3:09 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=178624494468.1.12752354240773595577.rpms-pgpdump-7726e2c9ef1d@fedoraproject.org \
    --to=nebebout@36wthb2.usi.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