Projects >> atmosphere >>a47407004c31f28b7c87dfe4e12474a99a3d3dbd

Chunk
Conflicting content 
        // this broadcaster.
        if (resources.isEmpty()) {
            BroadcasterFactory.getDefault().remove(this, name);
<<<<<<< HEAD

            if (lifeCyclePolicy.getLifeCyclePolicy() == BroadcasterLifeCyclePolicy.POLICY.EMPTY) {
                releaseExternalResources();
=======
>>>>>>> 99d4d374a4d31ba57616227b30610954adb76a04
        }
        return r;
    }
Solution content 
        // this broadcaster.
        if (resources.isEmpty()) {
            BroadcasterFactory.getDefault().remove(this, name);
            if (lifeCyclePolicy.getLifeCyclePolicy() == BroadcasterLifeCyclePolicy.POLICY.EMPTY) {
                releaseExternalResources();
            }
        }
        return r;
    }
File
DefaultBroadcaster.java
Developer's decision
Concatenation
Kind of conflict
Other