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

[Michael G. <ga...@ma...>]

Hi John,

Gavin is in the process of a massive update to HEAD to add all of the=20
Gateway quiz stuff.  Things may be a bit
iffy for 24 hours or so.  I'm at work for the next 3 hours or so, but=20
once I get home I have a copy of the installation
which I can use to get rid of any remaining conflicts.  I put a warning=20=

out a week ago on the home page
to be cautious about updating to HEAD for a little while until we get=20
things under control.

Take care,

Mike

On Jul 14, 2005, at 12:13 PM, John Jones wrote:

>  Hi everyone,
>
>  Are the files ok?=A0
>
>  I just looked at SetMaker.pm through the web-cvs.=A0 The diffs to the=20=

> previous version have lines added like
>
> >>>>>>> 1.20.2.2
>
>  This is a sign that a "cvs update" was done, there were conflicts=20
> which were not fixed, and then a "cvs commit" which would have put all=20=

> of the conflict markers in the files in cvs.
>
>  John
>