From: Andrew Cagney <cagney@redhat.com>
Date: Tue, 29 Jan 2002 21:37:15 +0000 (+0000)
Subject: Zap >>>>
X-Git-Tag: binutils-2_12-branchpoint~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba997f48828675c4bf76d4769b44586651995e3c;p=thirdparty%2Fbinutils-gdb.git

Zap >>>>
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de213873d97..caf55ae99f6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -50,7 +50,6 @@
 	* config/ns32k/tm-umax.h (INVALID_FLOAT): Delete macro that was
 	already commented out.
 
->>>>>>> 1.2087
 2002-01-26  Andreas Schwab  <schwab@suse.de>
 
 	* config/m68k/nm-linux.h (FETCH_INFERIOR_REGISTERS): Define.