From: Jim Blandy <jimb@codesourcery.com>
Date: Wed, 24 Jul 2002 03:05:07 +0000 (+0000)
Subject: Remove stray conflict marker.
X-Git-Tag: drow-cplus-branchpoint~1074
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8ae0f7e61a053497bcf30fbc113980c0f83f35e;p=thirdparty%2Fbinutils-gdb.git

Remove stray conflict marker.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7993d1ad63..917cf935af1 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