Zap botched merge.
authorAndrew Cagney <cagney@redhat.com>
Tue, 10 Jul 2001 23:02:29 +0000 (23:02 +0000)
committerAndrew Cagney <cagney@redhat.com>
Tue, 10 Jul 2001 23:02:29 +0000 (23:02 +0000)
gdb/ChangeLog

index dedb0be..4f22b92 100644 (file)
@@ -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