Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-10-21 22:50:10 +02:00
commit 3d7276ec46

View file

@ -727,12 +727,11 @@ public class OpeningHoursParser {
}
// check if valid
final OpeningHoursRule r1 = parseRule(r);
boolean rule = r1 instanceof UnparseableRule;
if (!rule) {
return null;
}
boolean rule = r1 instanceof BasicOpeningHourRule;
if (rule) {
rs.addRule(r1);
}
}
return rs;
}