From: David Taylor <taylor@redhat.com>
Date: Tue, 27 Feb 2001 21:58:33 +0000 (+0000)
Subject: remove conflict indicator.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3078eca93142e636b211897744a97b66569593b9;p=binutils-gdb.git

remove conflict indicator.
---

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