tweak

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35037 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e723556..ff1ddd4 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.