| Chunk |
|---|
| Conflicting content |
|---|
private static final String engineName = "Redis";
BinaryJedis conn;
<<<<<<< HEAD
private static final String KEYSEPARATOR = ":";
private static final int timeout = 300;
=======
final String KEYSEPARATOR = ":";
final int timeout = 0;
>>>>>>> df25be99afec3d47f8d96dc186b8cf9973b72dc5
public RedisInstance(String ksName, String cfName, int dbIndex)
{ |
| Solution content |
|---|
private static final String engineName = "Redis";
BinaryJedis conn;
private static final String KEYSEPARATOR = ":";
private static final int timeout = 300;
public RedisInstance(String ksName, String cfName, int dbIndex)
{ |
| File |
|---|
| RedisInstance.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |