> My line 51 is the <<<<<<< build.xml statement Then you had a merge conflict. Delete the file and update.
--- Noel
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
