From c898ebff4c7a2cb3d5375a8c600268477ec4db60 Mon Sep 17 00:00:00 2001
From: Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Date: Fri, 15 Dec 2000 20:56:42 +0000
Subject: [PATCH] whoops, remove conflict indicators!

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4724fb5b40..2c012d386a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -152,7 +152,6 @@ Fri Dec 15 22:58:59 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 	* configure.tgt (m68*-*-netbsd*, ns32k-*-netbsd*): Add gdbserver
  	to configdirs.
 
->>>>>>> 1.847
 2000-12-07  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
 
 	* config/sh/tm-sh.h (struct gdbarch_tdep): Rename fields