Projects >> logback >>d5dd5b19c808b3733dc7e9a1848fdffdcd11f126

Chunk
Conflicting content
  public ContextAwareBase() {
    declaredOrigin = this;
  }
<<<<<<< HEAD

  public ContextAwareBase(Object declaredOrigin) {
=======
  public ContextAwareBase(ContextAware declaredOrigin) {
>>>>>>> 0667b93153f0bc1faddffcfca33c85a15e4181f4
    this.declaredOrigin = declaredOrigin;
  }
Solution content
  public ContextAwareBase() {
    declaredOrigin = this;
  }

  public ContextAwareBase(ContextAware declaredOrigin) {
    this.declaredOrigin = declaredOrigin;
  }
File
ContextAwareBase.java
Developer's decision
Version 2
Kind of conflict
Method signature