projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 626d1ef)
tweak
authorJason Merrill <jason@gcc.gnu.org>
Fri, 14 Jul 2000 17:41:26 +0000 (13:41 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Fri, 14 Jul 2000 17:41:26 +0000 (13:41 -0400)
From-SVN: r35037

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e723556f9d9bfff433fca63c51de565577d1f776..ff1ddd4e1686ae6e16c992cc3a4b990c65c51a4b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -397,7 +397,6 @@ Tue Jul 11 16:26:17 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
        * cpp.texi: Update.
 
->>>>>>> 1.7094
 2000-07-11  Neil Booth  <NeilB@earthling.net>
 
        * cppinit.c: (cpp_reader_init): Allow digraphs by default.