OSDN Git Service

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

index d7993d1..917cf93 100644 (file)
        * 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