Changeset 11330 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
- Timestamp:
- 2016-11-27T17:06:21+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r11318 r11330 14 14 import org.openstreetmap.josm.data.osm.Relation; 15 15 import org.openstreetmap.josm.data.osm.RelationMember; 16 import org.openstreetmap.josm.gui.conflict.pair. ListMergeModel;16 import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel; 17 17 import org.openstreetmap.josm.gui.conflict.pair.ListRole; 18 18 import org.openstreetmap.josm.tools.CheckParameterUtil; … … 22 22 * @since 1631 23 23 */ 24 public class RelationMemberListMergeModel extends ListMergeModel<RelationMember, RelationMemberConflictResolverCommand> {24 public class RelationMemberListMergeModel extends AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand> { 25 25 26 26 @Override
Note:
See TracChangeset
for help on using the changeset viewer.