[commit-cp] classpath ChangeLog

[Tom Tromey]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Branch:         
Changes by:     Tom Tromey <[EMAIL PROTECTED]>  05/09/16 15:53:20

Modified files:
        .              : ChangeLog 

Log message:
        Remove cvs conflict marker

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.4821&tr2=1.4822&r1=text&r2=text