Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-21 08:58:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2386 from carbeer/patch-1

Browse source 
Change state_type to event_type
This commit is contained in:
Travis Ralston 2019-12-15 15:31:08 -07:00 committed by GitHub
parent c823bdbf70 3aba6e3eeb
commit f11f77f33b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specification/rooms/v1.rst
View file

@ -94,7 +94,7 @@ results of the resolution so far.
passes authentication in :math:`R` and add it to :math:`R`. passes authentication in :math:`R` and add it to :math:`R`.
A *conflict* occurs between states where those states have different 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. affected are said to be *conflicting* events.