From: cagney <cagney>
Date: Tue, 29 Jan 2002 21:37:15 +0000 (+0000)
Subject: Zap >>>>
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7e601bd06faa3eb6e389e32b03fec5aca6e9a329;p=pf3gnuchains%2Fsourceware.git

Zap >>>>
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de213873d9..caf55ae99f 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.