From: Jeff Law <law@gcc.gnu.org>
Date: Wed, 11 Aug 1999 07:25:49 +0000 (-0600)
Subject: Remove left-over CVS conflict marker
X-Git-Tag: prereleases/libstdc++-2.92~11220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4e897c16e8a8839dcb56732724d9403185ddb03;p=thirdparty%2Fgcc.git

Remove left-over CVS conflict marker

From-SVN: r28661
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b76a3d667e98..2672f4b7db3d 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