From 3078eca93142e636b211897744a97b66569593b9 Mon Sep 17 00:00:00 2001
From: David Taylor <taylor@redhat.com>
Date: Tue, 27 Feb 2001 21:58:33 +0000
Subject: [PATCH] remove conflict indicator.

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fcd0eda17e2..68c3a37b260 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -543,7 +543,6 @@ Wed Feb  7 19:41:21 2001  Andrew Cagney  <cagney@redhat.com>
 	(fill_fpregset): Likewise.
 	(supply_fpregset): Likewise.
 
->>>>>>> 1.973
 Tue Feb  6 11:58:57 2001  David Taylor  <taylor@redhat.com>
 
 	* valops.c (value_cast): If casting a scalar to a pointer, do not
-- 
2.30.2