From 3457d66e5b39f21ab507d9c505127352163f6f0c Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Mon, 23 Feb 2004 19:26:45 +0000
Subject: [PATCH] Remove conflict indicators.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c0a192e74..03a855fcad 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -309,7 +309,6 @@
 	* sh-tdep.c (sh_analyze_prologue): Eliminate useless test of
 	cache->uses_fp prior to setting it.
 
->>>>>>> 1.5450
 2004-02-19  Fred Fish  <fnf@redhat.com>
 
 	Fix for PR breakpoint/1558.
@@ -326,7 +325,6 @@
 	type being greater than sizeof of host's LONGEST.  Always use
 	unpack_long() unless format 'f' chosen.
 
->>>>>>> 1.5419
 2004-02-19  Joel Brobecker  <brobecker@gnat.com>
 
 	Committed by Elena Zannoni  <ezannoni@redhat.com>