Projects >> sensei >>3776c327644648c821a7d4bceea286e2119a94dd

Chunk
Conflicting content
  private Map _facetInfoMap = new HashMap();
  private BQLCompiler _compiler = null;
  private LayeredBroker federatedBroker;
<<<<<<< HEAD
  private JsonTemplateProcessor jsonTemplateProcessor = new JsonTemplateProcessor();
=======
  private Timer _statTimer;

>>>>>>> 702f5518e435c1b5837f2d94eeb1641ef44518f2
  public AbstractSenseiClientServlet() {
    _statTimer = new Timer(true);
  }
Solution content
  private Map _facetInfoMap = new HashMap();
  private BQLCompiler _compiler = null;
  private LayeredBroker federatedBroker;

  private JsonTemplateProcessor jsonTemplateProcessor = new JsonTemplateProcessor();

  private Timer _statTimer;


  public AbstractSenseiClientServlet() {
    _statTimer = new Timer(true);
  }
File
AbstractSenseiClientServlet.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation