| Chunk |
|---|
| Conflicting content |
|---|
embedded.teardown();
embedded = null;
}
<<<<<<< HEAD
=======
protected void setupClient() {
cassandraHostConfigurator = new CassandraHostConfigurator("127.0.0.1:9170");
pools = CassandraClientPoolFactory.INSTANCE.createNew(cassandraHostConfigurator);
}
>>>>>>> 92551fe9f523f39c7424c5d9496dd100cfc45a20
} |
| Solution content |
|---|
embedded.teardown();
embedded = null;
}
protected void setupClient() {
cassandraHostConfigurator = new CassandraHostConfigurator("127.0.0.1:9170");
pools = CassandraClientPoolFactory.INSTANCE.createNew(cassandraHostConfigurator);
}
} |
| File |
|---|
| BaseEmbededServerSetupTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |