diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2004-02-10 19:36:49 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-02-10 19:36:49 +0000 |
| commit | 97da3f36c6200d98d1e759f04921a9892003660f (patch) | |
| tree | 0cd5668fdc9a57dbdf7e4b43debcc24710ace88f | |
| parent | 8366ee633d0336a86adc2d445021893b5daf8417 (diff) | |
| download | gdb-97da3f36c6200d98d1e759f04921a9892003660f.tar.gz | |
Removing conflict indicators that CVS only told me about after it checked the
file in.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9d9921e304b..1c9765eb902 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -54,7 +54,6 @@ * symfile.c (reread_symbols): Ditto. * gdb_obstack.h: Add comment. ->>>>>>> 1.5354 2004-02-09 Elena Zannoni <ezannoni@redhat.com> * linespec.c (decode_line_1, locate_first_half) |