diff options
| author | dpatel <dpatel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-04-22 19:53:37 +0000 |
|---|---|---|
| committer | dpatel <dpatel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-04-22 19:53:37 +0000 |
| commit | 7b9e029eca6ea3da396d835cfef24a106546a7f2 (patch) | |
| tree | 1f535ef24ed4c1235f09eae48f23fe17a4226185 | |
| parent | 65688736c069de1727a6b561d4cdaa86cca2bb67 (diff) | |
| download | ppe42-gcc-7b9e029eca6ea3da396d835cfef24a106546a7f2.tar.gz ppe42-gcc-7b9e029eca6ea3da396d835cfef24a106546a7f2.zip | |
Remove conflict indicator.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@65953 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a9df8358136..ca69ac91ab0 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 |
