Projects information

Chunk

Conflicting content
* @author elandau */ public class StaticDeploymentContext implements DeploymentContext { <<<<<<< HEAD ======= private static final Logger LOG = LoggerFactory.getLogger(StaticDeploymentContext.class); >>>>>>> 39e7cf00ccf6866796ea46be65549867d25c2565 private static volatile DeploymentContext delegate; @Inject

Conflicting content

 * @author elandau
 */
public class StaticDeploymentContext implements DeploymentContext {
<<<<<<< HEAD
=======
    private static final Logger LOG = LoggerFactory.getLogger(StaticDeploymentContext.class);

>>>>>>> 39e7cf00ccf6866796ea46be65549867d25c2565
    private static volatile DeploymentContext delegate;
    
    @Inject

Solution content
* @author elandau */ public class StaticDeploymentContext implements DeploymentContext { private static volatile DeploymentContext delegate; @Inject

File
StaticDeploymentContext.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Projects >> archaius >>e00df99fa5ee174f3b77ed3887c7834819154af3