From d7aa3e1e9a201d2cb8e90874f9c3d8d6976a850b Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zack@gcc.gnu.org>
Date: Sat, 20 Oct 2001 18:16:32 +0000
Subject: [PATCH] Remove stray conflict marker

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f0fe8e79e6b..e8cfc22df08 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -90,7 +90,6 @@ Sat Oct 20 12:01:07 CEST 2001  Jan Hubicka  <jh@suse.cz>
 	call run_directive directly.
 	(_cpp_do__Pragma): Simplify.
 
->>>>>>> 1.11604
 2001-10-19  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* pe.c (arm_pe_unique_section): Const-ify.