On Mon, 2002-02-11 at 23:18, David Jencks wrote: > On 2002.02.12 01:29:32 -0500 Jason Dillon wrote: > > Ouch... had MainDeployer opened and modified... CVS is really bad at > > doing merges.... ahhh. > > > > Should be OK though. Might want to verify that I did not just clobber > > your changes. > > > > --jason > > Ouch is right. I wasn't too happy with your changes earlier either, having > spent most of the day tracking down deployer bugs;-)
Sorry about that. Wish there was a better way to deal with this. I usually end up just dumping my changes and starting over. > your second set looks ok to me. > > Could you please follow the coding conventions, i.e. > > if (true) > { > } > else > { > } > > rather than > if (true) { > } > else { > } > > ? I don't like this style much either, but it is the official jboss style. Will try, but that swag hurts my eyes and my mouse wheel finger. --jason _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development