| Chunk |
|---|
| Conflicting content |
|---|
static {
<<<<<<< HEAD
String rxfcouchprefix = RxfBootstrap.getVar("RXF_COUCH_PREFIX","http://localhost:5894");
=======
String rxfcouchprefix = RxfBootstrap.getVar("COUCH_PREFIX","http://localhost:5894");
>>>>>>> 4c318cf8875c3304e9211ba02f174c02091305e0
try {
URI uri = new URI(rxfcouchprefix);
int port = uri.getPort(); |
| Solution content |
|---|
static {
String rxfcouchprefix = RxfBootstrap.getVar("RXF_COUCH_PREFIX","http://localhost:5894");
try {
URI uri = new URI(rxfcouchprefix);
int port = uri.getPort(); |
| File |
|---|
| BlobAntiPatternObject.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |