Re: [WWdevel] webwork: problem values getting set to zero

[P G. L. <gl...@um...>]

Hi John,

That's my error.  I'll double check the other files that had conflicts.  I
thought I had caught all of them, but obviously missed that one.

Gavin

On Thu, 14 Jul 2005 at 09:13 John Jones wrote:

> 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
>
>

-- 
P. Gavin LaRose, Ph.D.  Program Manager (Instructional Tech.)
Math Dept., University of Michigan
gl...@um...                        "There's no use in trying," [Alice]
734.764.6454                             said. "One Can't believe impossible
http://www.math.lsa.umich.edu/~glarose/  things." "I daresay you haven't had
                                         much practice," said the Queen.
                                                              - Lewis Carrol