diff options
| author | Mark Kettenis <kettenis@gnu.org> | 2004-06-26 11:49:19 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@gnu.org> | 2004-06-26 11:49:19 +0000 |
| commit | 35819f5e08d7c31ea3588171554900b4b0b5ed0e (patch) | |
| tree | eed50d0efbff26c424374d87c9e4d8f0ba701010 | |
| parent | cb4610693dc34ce904d1c6f1fb7f49cc2149dbd1 (diff) | |
| download | gdb-35819f5e08d7c31ea3588171554900b4b0b5ed0e.zip gdb-35819f5e08d7c31ea3588171554900b4b0b5ed0e.tar.gz gdb-35819f5e08d7c31ea3588171554900b4b0b5ed0e.tar.bz2 | |
Remove stray CVS conflict marker.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3600061..f366816 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -243,7 +243,6 @@ * cli/cli-cmds.c (disassemble_command): Update. * vax-tdep.c (vax_gdbarch_init): Update. ->>>>>>> 1.6028 2004-06-18 Mark Kettenis <kettenis@gnu.org> * i386-tdep.c (i386_collect_fpregset): Fix comment. |