| Chunk |
|---|
| Conflicting content |
|---|
{
try
{
<<<<<<< HEAD
client = CassandraProxyClient.newProxyConnection("localhost", 9160, true, ConnectionStrategy.RANDOM);
=======
client = CassandraProxyClient.newProxyConnection("localhost", 9160, true, CassandraProxyClient.ConnectionStrategy.RANDOM);
>>>>>>> 888846988d215854a54d2ee61ad04ff3cbe1367a
client.set_keyspace("PortfolioDemo");
} |
| Solution content |
|---|
{
try
{
client = CassandraProxyClient.newProxyConnection("localhost", 9160, true, ConnectionStrategy.RANDOM);
client.set_keyspace("PortfolioDemo");
} |
| File |
|---|
| PortfolioMgrHandler.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |