Projects >> hudson >>296c06d85d71ee62a9a759d3ca5a9fa3f0c0d896

Chunk
Conflicting content 
        }
        AbstractBuild b=previousBuildUpstreamBuild;
        do {
<<<<<<< HEAD
            recipientList.addAll(buildCulpritList(listener,b.getCulprits()));
=======
            recipientList.addAll( buildCulpritList( listener, b.getCulprits() ) );
>>>>>>> 776008c8c4c02537f54b667487ab4261645fbc63
            b = b.getNextBuild();
        } while ( b != upstreamBuild && b != null );
    }
Solution content 
        }
        AbstractBuild b=previousBuildUpstreamBuild;
        do {
            recipientList.addAll(buildCulpritList(listener,b.getCulprits()));
            b = b.getNextBuild();
        } while ( b != upstreamBuild && b != null );
    }
File
MailSender.java
Developer's decision
Version 1
Kind of conflict
Method invocation