| Chunk |
|---|
| Conflicting content |
|---|
private final String version;
public FitNesseVersion() {
<<<<<<< HEAD
this("v20120928");
=======
this("v20120921");
>>>>>>> 54269b3aa259370f75d35be5b8f9fb269022beb9
}
public FitNesseVersion(String version) { |
| Solution content |
|---|
private final String version;
public FitNesseVersion() {
this("v20120928");
}
public FitNesseVersion(String version) { |
| File |
|---|
| FitNesseVersion.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |