Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-19 14:37:47 +02:00
commit 11fa1ffd04

View file

@ -244,7 +244,6 @@ public class RouteDataObject {
return maxSpeed ; return maxSpeed ;
} }
public static float parseSpeed(String v, float def) { public static float parseSpeed(String v, float def) {
if(v.equals("none")) { if(v.equals("none")) {
return RouteDataObject.NONE_MAX_SPEED; return RouteDataObject.NONE_MAX_SPEED;