From 232e2675dd0ca2f461268f6deca83c0f38e37061 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 14 Jan 2015 14:48:43 +0000
Subject: [PATCH] Brief mention of state conflict resolution

---
 drafts/erikj_federation.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drafts/erikj_federation.rst b/drafts/erikj_federation.rst
index 9e38b445..c45626ef 100644
--- a/drafts/erikj_federation.rst
+++ b/drafts/erikj_federation.rst
@@ -284,6 +284,14 @@ pick the one with the greatest:
 #. Hash of event_id.
 
 
+State Conflict Resolution
+-------------------------
+
+If a server discovers that it disagrees with another about the current state,
+it can follow the same process outlined in *Auth chain resolution* to resolve
+these conflicts.
+
+
 Appendix
 ========