diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 36000619e7..f366816679 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.