[cp-patches] Re: [FYI] Delete ChangeLog CVS conflict markers

Tom Tromey tromey at redhat.com
Fri Jun 16 18:53:29 UTC 2006


>>>>> "Keith" == Keith Seitz <keiths at redhat.com> writes:

Keith> Anyone else notice that there are CVS conflict markers in the ChangeLog?

Nope.  Oops.

Keith> cvs annotate shows:
Keith> 1.7849       (tromey   16-Jun-06): >>>>>>> 1.7848
Keith> 1.7841       (rschuste 16-Jun-06): >>>>>>> 1.7824
Keith> 1.7841       (rschuste 16-Jun-06): >>>>>>> 1.7799

Keith> I've deleted these lines and committed.

Keith> Tom and Robert: Would please you verify that your ChangeLog entries
Keith> are correct around these markers?

Mine was.

Tom



More information about the Classpath-patches mailing list