diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7993d1ad6..917cf935af 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -258,7 +258,6 @@
 	* config/d30v/d30v.mt: Ditto.
 	* config/d30v/tm-d30v.h: Ditto.
 
->>>>>>> 1.2930
 2002-07-13  Aidan Skinner <aidan@velvet.net>
 
 	* ada-tasks.c (add_task_entry): replace calls to