whoops, remove conflict indicators!

This commit is contained in:
Elena Zannoni 2000-12-15 20:56:42 +00:00
parent a38d2a54be
commit c898ebff4c
1 changed files with 0 additions and 1 deletions

View File

@ -152,7 +152,6 @@ Fri Dec 15 22:58:59 2000 Andrew Cagney <cagney@b1.cygnus.com>
* configure.tgt (m68*-*-netbsd*, ns32k-*-netbsd*): Add gdbserver
to configdirs.
>>>>>>> 1.847
2000-12-07 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
* config/sh/tm-sh.h (struct gdbarch_tdep): Rename fields