Skip to content

Commit

Permalink
Further fixing merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
beurdouche committed Jul 11, 2023
1 parent ac17296 commit ba52e47
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions draft-ietf-mls-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ if only the group administrator is allowed to change group members,
then it is the responsibility of the application to inform members
of this policy and who the administrator is.

## Users, Clients, and Groups
## Users, Clients, and Groups {#group-members}

While it's natural to think of a messaging system as consisting of groups
of users, possibly using different devices, in MLS the basic unit of
Expand Down Expand Up @@ -622,8 +622,6 @@ multiple times. Clients are responsible for providing new
KeyPackages as necessary in order to minimize the chance that
the "last resort" KeyPackage will be used.



## Delivery of Messages {#delivery-guarantees}

The main responsibility of the Delivery Service is to ensure delivery of
Expand Down

0 comments on commit ba52e47

Please sign in to comment.