From 61d74548d6cb79c73d787f43835effe6f272991a Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@gcc.gnu.org>
Date: Fri, 30 May 2003 00:50:32 +0000
Subject: [PATCH] Remove conflict marker.

From-SVN: r67239
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe298df89c3..3e60d81311b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -51,7 +51,6 @@
 	(expand_unreachable_stmt): Expand unreachable while statements
 	using genrtl_do_stmt_1.
 
->>>>>>> 1.17950
 2003-05-29  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/mips/mips-protos.h (mips_output_load_label): Declare.
-- 
2.30.2