From: Andrew Cagney <cagney@redhat.com>
Date: Tue, 10 Jul 2001 23:02:29 +0000 (+0000)
Subject: Zap botched merge.
X-Git-Tag: gdb_5_1-2001-07-29-branchpoint~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37febd2b53a5289b36d449c826be749b125e2312;p=thirdparty%2Fbinutils-gdb.git

Zap botched merge.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dedb0bea438..4f22b9277a6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -70,7 +70,6 @@
 	* valops.c (value_cast): When casting a pointer to an integer,
 	don't convert it to an address.
 
->>>>>>> 1.1438
 2001-07-10  Andrew Cagney  <ac131313@redhat.com>
 
 	* remote-utils.h (struct serial): Declare as opaque.  Remove