summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/state.py')
-rw-r--r--synapse/state.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 551058b510..15397e2f38 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -203,9 +203,10 @@ class StateHandler(object):
         }
 
         if event_type:
-            prev_states = conflicted_state.get(
-                (event_type, state_key), {}
-            ).keys()
+            prev_states_events = conflicted_state.get(
+                (event_type, state_key), []
+            )
+            prev_states = [s.event_id for s in prev_states_events]
         else:
             prev_states = []