From: Anthony Green <green@gcc.gnu.org>
Date: Thu, 8 Nov 2001 15:13:11 +0000 (+0000)
Subject: Somebody forgot a >>>>>>>>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3248fb6cc439e756430002bf78f01a9eb297babc;p=gcc.git

Somebody forgot a >>>>>>>>

From-SVN: r46844
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8389e10831..a03ff2c63ed 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -383,7 +383,6 @@ Tue Nov  6 09:21:34 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 	arrays.
 	Fixes PR c/461.
 
->>>>>>> 1.11778
 2001-11-05  Zack Weinberg  <zack@codesourcery.com>
 
 	* aclocal.m4: (AM_WITH_NLS): Don't look at ALL_LINGUAS.