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

[Keith Seitz]

Hi,

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?

Keith