package fitnesse;

public class FitNesseVersion {
<<<<<<< HEAD
	public String toString() {
		return "v20100816";
	}
=======
  private final String version;
	
  public FitNesseVersion() {
    this("v20100613");
  }

  public FitNesseVersion(String version) {
    this.version = version;
  }

  public String toString() {
    return version;
  }

  public boolean isAtLeast(String requiredVersion) {
    long thisVersion = Long.parseLong(version.substring(1));
    long otherVersion = Long.parseLong(requiredVersion.substring(1));
    return thisVersion >= otherVersion;
  }
>>>>>>> 9709c61995ad3073051a9132035f5d46e4d21c9d
}

package fitnesse;

public class FitNesseVersion {
  private final String version;
	
  public FitNesseVersion() {
    this("v20100816");
  }

  public FitNesseVersion(String version) {
    this.version = version;
  }

  public String toString() {
    return version;
  }

  public boolean isAtLeast(String requiredVersion) {
    long thisVersion = Long.parseLong(version.substring(1));
    long otherVersion = Long.parseLong(requiredVersion.substring(1));
    return thisVersion >= otherVersion;
  }
}