Re: [GUMP@lsd]: depot/depot-common failed

[Adam R. B. Jack]

Two commit in SVN clashed and an update caused a merged file:

    >>>>
        1 file
    ======
        1 file
    <<<<<

or something like that. Hence the XML parse failure...

> Buildfile: build.xml
> 
> BUILD FAILED
> /data3/gump/depot/common/build.xml:1: Document root element is missing.

I've done a manual merge, and think we have a good version now.

regards

Adam