Projects >> fitnesse >>e5df7422212d6f9d6f605d91e66e030dd210c47a

Chunk
Conflicting content 
  private final String version;
	
  public FitNesseVersion() {
<<<<<<< HEAD
    this("v20110304");
=======
    this("v20110324");
>>>>>>> 111fece0f62570fe6a16675f5b894e15388f190d
  }

  public FitNesseVersion(String version) {
Solution content 
  private final String version;
	
  public FitNesseVersion() {
    this("v20110324");
  }

  public FitNesseVersion(String version) {
File
FitNesseVersion.java
Developer's decision
Version 2
Kind of conflict
Method invocation