Merge pull request #2386 from carbeer/patch-1

Change state_type to event_type
pull/977/head
Travis Ralston 5 years ago committed by GitHub
commit f11f77f33b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -94,7 +94,7 @@ results of the resolution so far.
passes authentication in :math:`R` and add it to :math:`R`.
A *conflict* occurs between states where those states have different
``event_ids`` for the same ``(state_type, state_key)``. The events thus
``event_ids`` for the same ``(event_type, state_key)``. The events thus
affected are said to be *conflicting* events.

Loading…
Cancel
Save