diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-11 07:25:49 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-11 07:25:49 +0000 |
| commit | 7e74fbcf9ec7ac3d7cb29980d4905ec421dfbc1c (patch) | |
| tree | 4de7fdc9a6066670fca63ce06f076fa1b348b52d | |
| parent | 51c6d414183a26207c3958d3a97dd794f9c8ff51 (diff) | |
| download | ppe42-gcc-7e74fbcf9ec7ac3d7cb29980d4905ec421dfbc1c.tar.gz ppe42-gcc-7e74fbcf9ec7ac3d7cb29980d4905ec421dfbc1c.zip | |
Remove left-over CVS conflict marker
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28661 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 b76a3d667e9..2672f4b7db3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -429,7 +429,6 @@ Mon Aug 9 01:52:24 1999 Jason Merrill <jason@yorick.cygnus.com> * except.c (expand_eh_region_start_for_decl): Always start a new block. * stmt.c (is_eh_region): Make sure current_function is present, too. ->>>>>>> 1.4094 Mon Aug 9 01:15:24 1999 Jeffrey A Law (law@cygnus.com) * pa.h (HARD_REGNO_MODE_OK): Correctly handle FPregs, even when |
