Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-25 11:20:30 +01:00
commit 24a0a54f94

View file

@ -26,7 +26,6 @@ public class Amenity extends MapObject {
public static final String OPENING_HOURS = "opening_hours";
public static final String CONTENT = "content";
private static final long serialVersionUID = 132083949926339552L;
private String subType;
private PoiCategory type;
// duplicate for fast access