| Chunk |
|---|
| Conflicting content |
|---|
return Connector.getConnector(connectorName);
}
<<<<<<< HEAD
private String getConnectorName(String beanClassName) {
int startIndex = "com.fluxtream.connectors.".length();
return beanClassName.substring(startIndex,
beanClassName.indexOf(".", startIndex + 1));
}
=======
>>>>>>> 3455611ec9c2cada9fb22897ef5f81f67c609858
public AbstractUpdater() {
}
|
| Solution content |
|---|
return Connector.getConnector(connectorName);
}
public AbstractUpdater() {
}
|
| File |
|---|
| AbstractUpdater.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |