diff options
| author | Matt Kraai <kraai@gcc.gnu.org> | 2003-05-30 00:50:32 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@gcc.gnu.org> | 2003-05-30 00:50:32 +0000 |
| commit | 61d74548d6cb79c73d787f43835effe6f272991a (patch) | |
| tree | bd948859aa9f0f0927ed54491077fb48c79e211a /gcc | |
| parent | 8fdf766886512c1558c3d7d3604c25d00fb8c943 (diff) | |
| download | gcc-61d74548d6cb79c73d787f43835effe6f272991a.zip gcc-61d74548d6cb79c73d787f43835effe6f272991a.tar.gz gcc-61d74548d6cb79c73d787f43835effe6f272991a.tar.bz2 | |
Remove conflict marker.
From-SVN: r67239
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fe298df..3e60d81 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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. |