From 7f1ef1da4a30bacdeadcd295a7187cd34da818ed Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Tue, 24 Oct 2000 04:11:02 +0000
Subject: [PATCH] Cleanup merge botch.

---
 gdb/ChangeLog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab50cd17aa5..f2bd13a2251 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -40,7 +40,6 @@ Fri Oct 20 19:08:47 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 	* remote-utils.c (gr_multi_scan): Protoize.
 	* remote-vx.c (vx_xfer_memory, net_get_symbols): Protoize.
 
->>>>>>> 1.717
 2000-10-13  Fernando Nasser  <fnasser@cygnus.com>
 
 	* remote.c (putpkt_binary): Call read_frame, not getpkt. Log message.
@@ -133,7 +132,6 @@ Fri Oct 20 19:08:47 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 	* rs6000-tdep.c (skip_prologue): Add new parameter lim_pc.
 	Update all callers.
 
->>>>>>> 1.709
 2000-10-03  Kevin Buettner  <kevinb@redhat.com>
 
 	* remote-bug.c (bug_xfer_memory, bug_insert_breakpoint,
-- 
2.30.2