diff options
| author | Jim Blandy <jimb@codesourcery.com> | 2002-07-24 03:05:07 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@codesourcery.com> | 2002-07-24 03:05:07 +0000 |
| commit | b8ae0f7e61a053497bcf30fbc113980c0f83f35e (patch) | |
| tree | ce569e4513445e1115719dc10ba1d8f8b1a5311a | |
| parent | f7321c061e11b27aea8d4015bec459b50229cecf (diff) | |
| download | gdb-b8ae0f7e61a053497bcf30fbc113980c0f83f35e.zip gdb-b8ae0f7e61a053497bcf30fbc113980c0f83f35e.tar.gz gdb-b8ae0f7e61a053497bcf30fbc113980c0f83f35e.tar.bz2 | |
Remove stray conflict marker.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d7993d1..917cf93 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 |