Fix previous patch.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23e5c92..cbd52b1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -66,7 +66,6 @@ Wed May 12 07:27:31 1999  Craig Burley  <craig@jcb-sc.com>
        * flags.h: Declare flag_errno_math.
        * toplev.c: Define flag_errno_math.
 
->>>>>>> 1.3645
 Tue May 11 23:55:49 1999  Jeffrey A Law  (law@cygnus.com)
 
        * fixproto: Change "mkdir" calls to "mkdir -p"