diff options
| author | Jeff Law <law@gcc.gnu.org> | 1999-08-11 01:25:49 -0600 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-08-11 01:25:49 -0600 |
| commit | c4e897c16e8a8839dcb56732724d9403185ddb03 (patch) | |
| tree | 4de7fdc9a6066670fca63ce06f076fa1b348b52d | |
| parent | 7aed7b7099bd6dca92b5f0e43255b525b2ca5355 (diff) | |
| download | gcc-c4e897c16e8a8839dcb56732724d9403185ddb03.zip gcc-c4e897c16e8a8839dcb56732724d9403185ddb03.tar.gz gcc-c4e897c16e8a8839dcb56732724d9403185ddb03.tar.bz2 | |
Remove left-over CVS conflict marker
From-SVN: r28661
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b76a3d6..2672f4b 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 |