From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 17 Jan 2002 11:01:39 +0000 (+0000)
Subject: Remove leftover conflict marker.
X-Git-Tag: binutils-2_12-branchpoint~430
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5fe2c65800586593eb97e71fb44a56c801d21b;p=thirdparty%2Fbinutils-gdb.git

Remove leftover conflict marker.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cd3b3f56a35..f366a997c9e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -93,7 +93,6 @@
 	(xstormy16_reloc_type_lookup): Use 'table' field to locate correct
 	howto entry.
 
->>>>>>> 1.1263
 2002-01-10  Michael Snyder  <msnyder@redhat.com>
 
 	* elf.c (elfcore_write_prstatus): Use long instead of pid_t;