From ba997f48828675c4bf76d4769b44586651995e3c Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Tue, 29 Jan 2002 21:37:15 +0000
Subject: Zap >>>>

---
 gdb/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gdb')

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de21387..caf55ae 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.
-- 
cgit v1.1