gcc/gcc/java ChangeLog

[apbianco@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	apbianco@gcc.gnu.org	2001-08-28 19:31:55

Modified files:
	gcc/java       : ChangeLog 

Log message:
	Removing conflict indicators. Oops.

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