Merge branch '1.0' into develop

This commit is contained in:
jannis 2019-08-25 13:17:38 +02:00
commit a7d683ad4e

View File

@ -11,13 +11,9 @@ public class ImperialWithMeters extends Imperial {
public double getDistanceFromMeters(double meters) {
return meters;
}
@Override
public String getLongDistanceUnit() {
return "m";
}
@Override
public String getShortDistanceUnit() {
return "yd";
return "m";
}
}