From: John J. <jj...@as...> - 2005-07-14 16:11:33
|
Hi everyone, Are the files ok? I just looked at SetMaker.pm through the web-cvs. The diffs to the previous version have lines added like >>>>>>> 1.20.2.2 This is a sign that a "cvs update" was done, there were conflicts which were not fixed, and then a "cvs commit" which would have put all of the conflict markers in the files in cvs. John |