From 461c166993aa3bb3022e90451bbadcd24a0d1531 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@gcc.gnu.org>
Date: Sat, 15 Sep 2001 11:51:23 +0000
Subject: [PATCH] Remove conflict indicators committed as part of revision
 1.11335 by echristo on 15-Sep-01.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17ddd38c9a7..6ea0c949f9c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -196,7 +196,6 @@ Fri Sep 14 13:54:50 EDT 2001  John Wehle  (john@feith.com)
 	* crti.asm: New file.
 	* crtn.asm: New file.
 
->>>>>>> 1.11331
 2001-09-13  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* c-parse.in (_yylex): Use _cpp_backup_tokens.
-- 
2.30.2