Remove stray CVS conflict marker.
This commit is contained in:
parent
cb4610693d
commit
35819f5e08
1 changed files with 0 additions and 1 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue