From 39e3fc69e5a190371aa6936bfea57e9f8bd5255b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Sep 2014 17:11:00 +0100
Subject: Make the state resolution use actual power levels rather than taking
 them from a Pdu key.

---
 synapse/federation/units.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'synapse/federation')

diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 9740431279..622fe66a8f 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -69,6 +69,7 @@ class Pdu(JsonEncodedObject):
         "prev_state_id",
         "prev_state_origin",
         "required_power_level",
+        "user_id",
     ]
 
     internal_keys = [
-- 
cgit 1.4.1