gcc/gcc ChangeLog

[neroden@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	neroden@gcc.gnu.org	2004-08-03 20:33:54

Modified files:
	gcc            : ChangeLog 

Log message:
	Remove spurious conflict marker

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