projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7321c0)
Remove stray conflict marker.
authorJim Blandy <jimb@codesourcery.com>
Wed, 24 Jul 2002 03:05:07 +0000 (03:05 +0000)
committerJim Blandy <jimb@codesourcery.com>
Wed, 24 Jul 2002 03:05:07 +0000 (03:05 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7993d1ad63119eaeed987cc21a1ed62c3745d42..917cf935af1090d525e65bd17337b0130c0a63c1 100644 (file)
--- 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