Remove conflict marker.

From-SVN: r67239
This commit is contained in:
Matt Kraai 2003-05-30 00:50:32 +00:00
parent 8fdf766886
commit 61d74548d6
1 changed files with 0 additions and 1 deletions

View File

@ -51,7 +51,6 @@
(expand_unreachable_stmt): Expand unreachable while statements
using genrtl_do_stmt_1.
>>>>>>> 1.17950
2003-05-29 Richard Sandiford <rsandifo@redhat.com>
* config/mips/mips-protos.h (mips_output_load_label): Declare.