Projects >> hudson >>1a3ed4632d3993230a0614a6306c70a366abd222

Chunk
Conflicting content 
    @Override
    protected void tearDown() throws Exception {
        try {
<<<<<<< HEAD
            if (jenkins!=null) {
                for (EndOfTestListener tl : jenkins.getExtensionList(EndOfTestListener.class))
                    tl.onTearDown();
            }
=======
            if (jenkins!=null)
                for (EndOfTestListener tl : jenkins.getExtensionList(EndOfTestListener.class))
                    tl.onTearDown();
>>>>>>> baf884ee69bf5b7af86e0bc5eb8f16f630097a66

            if (timeoutTimer!=null) {
                timeoutTimer.cancel();
Solution content 
    @Override
    protected void tearDown() throws Exception {
        try {
            if (jenkins!=null) {
                for (EndOfTestListener tl : jenkins.getExtensionList(EndOfTestListener.class))
                    tl.onTearDown();
            }

            if (timeoutTimer!=null) {
                timeoutTimer.cancel();
File
HudsonTestCase.java
Developer's decision
Version 1
Kind of conflict
If statement