diff options
| author | David Taylor <taylor@redhat.com> | 2001-02-27 21:58:33 +0000 |
|---|---|---|
| committer | David Taylor <taylor@redhat.com> | 2001-02-27 21:58:33 +0000 |
| commit | 3078eca93142e636b211897744a97b66569593b9 (patch) | |
| tree | 334aaf2a8cebf938fcfbbfb45865ef166fa8d3f7 | |
| parent | 993f3aa5bc92a1413f58f340598a920434f932c0 (diff) | |
| download | gdb-3078eca93142e636b211897744a97b66569593b9.zip gdb-3078eca93142e636b211897744a97b66569593b9.tar.gz gdb-3078eca93142e636b211897744a97b66569593b9.tar.bz2 | |
remove conflict indicator.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fcd0eda..68c3a37 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 |