Ticket #14239: RelationMemberConflictResolverModel.java.diff

File RelationMemberConflictResolverModel.java.diff, 713 bytes (added by skyper, 9 years ago)

patch

  • RelationMemberConflictResolverModel.java

    org new  
    244244                        indices.add(decision.getPos());
    245245                    }
    246246                    if (roles.size() != 1 || !isCollectionOfConsecutiveNumbers(indices)) {
    247                         // roles to not patch or not consecutive members in relation, leave undecided
     247                        // roles do not match or not consecutive members in relation, leave undecided
    248248                        continue;
    249249                    }
    250250                    decisions.get(0).decide(RelationMemberConflictDecisionType.KEEP);