summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2001-11-08 15:13:11 +0000
committergreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2001-11-08 15:13:11 +0000
commitb8cc350640f720c2a276c54032bb4d78cacd1dad (patch)
tree5c5c19aae443fe0e23250ce0f8c3e66d55a9251f
parent403cf343721df4856afdbae265fdb22075eb1092 (diff)
downloadppe42-gcc-b8cc350640f720c2a276c54032bb4d78cacd1dad.tar.gz
ppe42-gcc-b8cc350640f720c2a276c54032bb4d78cacd1dad.zip
Somebody forgot a >>>>>>>>
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46844 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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.
OpenPOWER on IntegriCloud