public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
From: jkratoch@sourceware.org
To: archer-commits@sourceware.org
Subject: [SCM] archer-rmoseley-fedora-merge: Remove GIT conflict merge marker.
Date: Thu, 12 Feb 2009 19:22:00 -0000 [thread overview]
Message-ID: <20090212192223.5120.qmail@sourceware.org> (raw)
The branch, archer-rmoseley-fedora-merge has been updated
via 6cf87f9e59653ab1717feadd6ebbf88335e9659c (commit)
from 5925b7e53bd877feb9fdc0ed524604f819c20862 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 6cf87f9e59653ab1717feadd6ebbf88335e9659c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu Feb 12 20:20:54 2009 +0100
Remove GIT conflict merge marker.
The file looks now most close to the FSF revision 1.62.
-----------------------------------------------------------------------
Summary of changes:
bfd/elf32-spu.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
First 500 lines of diff:
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index d85afa8..0e8d010 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -1346,7 +1346,6 @@ build_stub (struct bfd_link_info *info,
if (ovl == 0)
/* Extra space for linked list entries. */
sec->size += 16;
->>>>>>> 6dea2c97a8617f01b34dc9d04810f31c049f4834:bfd/elf32-spu.c
break;
default:
hooks/post-receive
--
Repository for Project Archer.
reply other threads:[~2009-02-12 19:22 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=20090212192223.5120.qmail@sourceware.org \
--to=jkratoch@sourceware.org \
--cc=archer-commits@sourceware.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).