Remove stray CVS conflict marker.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 36000619e7a5d02d507794e8d0b377f268ec7bfc..f3668166793aef71df95f30509c0168a6d200fc4 100644 (file)
--- 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.