Removing conflict indicators that CVS only told me about after it checked the

file in.
This commit is contained in:
Jeff Johnston 2004-02-10 19:36:49 +00:00
parent 78ced17712
commit afa8c3c85f
1 changed files with 0 additions and 1 deletions

View File

@ -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)