From afa8c3c85fea60f725e8f014d9693398294d89f5 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 10 Feb 2004 19:36:49 +0000
Subject: [PATCH] Removing conflict indicators that CVS only told me about
 after it checked the file in.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9d9921e304..1c9765eb90 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -54,7 +54,6 @@
 	* symfile.c (reread_symbols): Ditto.
 	* gdb_obstack.h: Add comment.
 
->>>>>>> 1.5354
 2004-02-09  Elena Zannoni  <ezannoni@redhat.com>
 
 	* linespec.c (decode_line_1, locate_first_half)