Skip to content
Snippets Groups Projects
Commit 2aa87305 authored by Erik Johnston's avatar Erik Johnston
Browse files

Merge pull request #71 from matrix-org/auth-conflict-res 

When we see a difference in current state, actually use state conflict resolution algorithm
parents 6375abcd e441c10a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment