From: Jason Merrill <jason@gcc.gnu.org>
Date: Fri, 14 Jul 2000 17:41:26 +0000 (-0400)
Subject: tweak
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a41129f3ce07f2de7e5a284b88812622f8ea8c03;p=gcc.git

tweak

From-SVN: r35037
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e723556f9d9..ff1ddd4e168 100644
--- 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.