Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor grammar fix. #1120

Merged
merged 1 commit into from
Feb 14, 2018
Merged

Minor grammar fix. #1120

merged 1 commit into from
Feb 14, 2018

Conversation

jevolk
Copy link
Contributor

@jevolk jevolk commented Feb 14, 2018

No description provided.

@ara4n
Copy link
Member

ara4n commented Feb 14, 2018

thanks.

@ara4n ara4n merged commit 726af76 into matrix-org:master Feb 14, 2018
RiotTranslateBot pushed a commit to RiotTranslateBot/matrix-doc that referenced this pull request Aug 22, 2023
In matrix-org#1042 I incorrectly wrote that the conflicted state set is a set of
pairs (K, V). We later take the union of the conflicted state set and
the auth difference. The latter is a set of events (V) only.

Fix this by making the conflicted state set a set of events rather than
a set of pairs. That is, the conflicted state set is a a `Set[Event]`
instead of a `Set[((type, state key), event)]`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants