From c4e897c16e8a8839dcb56732724d9403185ddb03 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 11 Aug 1999 01:25:49 -0600 Subject: Remove left-over CVS conflict marker From-SVN: r28661 --- gcc/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'gcc') 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 * 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 -- cgit v1.1