Re: Merge conflicts

[Ted Dunning]

+1 !!

On Wed, Sep 15, 2010 at 8:31 AM, Jeff Eastman <j...@windwardsolutions.com>wrote:

> the thankless job (BTW, thank you) of removing checkstyle warnings