diff options
| author | Devang Patel <dpatel@gcc.gnu.org> | 2003-04-22 12:53:37 -0700 |
|---|---|---|
| committer | Devang Patel <dpatel@gcc.gnu.org> | 2003-04-22 12:53:37 -0700 |
| commit | df1b07f3b958638590d3a49c8df6d49443369952 (patch) | |
| tree | 1f535ef24ed4c1235f09eae48f23fe17a4226185 | |
| parent | f945b4e0f5e0b90aa39b74c1bc4f9f5f2f8170ae (diff) | |
| download | gcc-df1b07f3b958638590d3a49c8df6d49443369952.zip gcc-df1b07f3b958638590d3a49c8df6d49443369952.tar.gz gcc-df1b07f3b958638590d3a49c8df6d49443369952.tar.bz2 | |
Remove conflict indicator.
From-SVN: r65953
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a9df835..ca69ac9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -63,7 +63,6 @@ (note_eh_region_may_contain_throw): New function. * except.h (note_eh_region_may_contain_throw): New function. ->>>>>>> 1.17566 2003-04-21 Mark Mitchell <mark@codesourcery.com> * config/i386/winnt.c (i386_pe_mark_dllimport): Revert previous |