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