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 | afa8c3c85fea60f725e8f014d9693398294d89f5 (patch) | |
| tree | b9bfec22b33b4d1c17f6a458f0112767eb1f6a55 | |
| parent | 78ced177128d6e4cf96d2af96e1468d8ee1aa6aa (diff) | |
| download | binutils-afa8c3c85fea60f725e8f014d9693398294d89f5.zip binutils-afa8c3c85fea60f725e8f014d9693398294d89f5.tar.gz binutils-afa8c3c85fea60f725e8f014d9693398294d89f5.tar.bz2 | |
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 9d9921e..1c9765e 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) |