| Chunk |
|---|
| Conflicting content |
|---|
public CassandraClientPoolImpl(CassandraClientMonitor clientMonitor,
CassandraHostConfigurator cassandraHostConfigurator) {
this(clientMonitor, cassandraHostConfigurator.buildCassandraHosts());
<<<<<<< HEAD
this.cassandraHostConfigurator = cassandraHostConfigurator;
=======
this.cassandraHostConfigurator = cassandraHostConfigurator;
>>>>>>> 028ec1229bd98bc725ddd3da1c9d53df16385cc0
}
|
| Solution content |
|---|
public CassandraClientPoolImpl(CassandraClientMonitor clientMonitor,
CassandraHostConfigurator cassandraHostConfigurator) {
this(clientMonitor, cassandraHostConfigurator.buildCassandraHosts());
this.cassandraHostConfigurator = cassandraHostConfigurator;
}
|
| File |
|---|
| CassandraClientPoolImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |