projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d6d2676)
Somebody forgot a >>>>>>>>
authorAnthony Green <green@gcc.gnu.org>
Thu, 8 Nov 2001 15:13:11 +0000 (15:13 +0000)
committerAnthony Green <green@gcc.gnu.org>
Thu, 8 Nov 2001 15:13:11 +0000 (15:13 +0000)
From-SVN: r46844

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8389e108319c56d13c7754c7f7033a6a9aadf91..a03ff2c63eda85712a9d252c8481c4984ebf40a5 100644 (file)
--- 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.