gcc/gcc ChangeLog

[geoffk@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	geoffk@gcc.gnu.org	2000-12-01 16:19:35

Modified files:
	gcc            : ChangeLog 

Log message:
	Remove conflict indicator

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&r1=1.8478&r2=1.8479