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

Keith Seitz keiths at redhat.com
Fri Jun 16 18:45:57 UTC 2006


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

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

I've deleted these lines and committed.

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


More information about the Classpath-patches mailing list