Zap botched merge.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dedb0bea4383a190c493f09cf2ff87b572dedff1..4f22b9277a6aa3309ac860c083625148532f2fe6 100644 (file)
--- 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