Projects >> wro4j >>a1d5bed0b42e57374c954a85a58eedef0a65756b

Chunk
Conflicting content 
  public static Context get() {
    validateContext();
    final String correlationId = CORRELATION_ID.get();
<<<<<<< HEAD
    LOG.debug("getContext for correlationId: {}", correlationId);
=======
    LOG.debug("get Context for correlationId: {}", correlationId);
>>>>>>> 8e8162b6268f0708343b6b9f7ee067d497a1784a
    return CONTEXT_MAP.get(correlationId);
  }
Solution content 
  public static Context get() {
    validateContext();
    final String correlationId = CORRELATION_ID.get();
    LOG.debug("getContext for correlationId: {}", correlationId);
    return CONTEXT_MAP.get(correlationId);
  }
File
Context.java
Developer's decision
Version 1
Kind of conflict
Method invocation