From 35819f5e08d7c31ea3588171554900b4b0b5ed0e Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 26 Jun 2004 11:49:19 +0000 Subject: [PATCH] Remove stray CVS conflict marker. --- gdb/ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 36000619e7a..f3668166793 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 * i386-tdep.c (i386_collect_fpregset): Fix comment. -- 2.30.2