egcs/gcc ChangeLog

[zack@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	egcs
Changes by:	zack@sourceware.cygnus.com	00/06/05 10:00:33

Modified files:
	gcc            : ChangeLog 

Log message:
	Oops, remove conflict marker

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