summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-23 16:15:10 +0000
committerErik Johnston <erik@matrix.org>2017-01-23 16:15:10 +0000
commitba8e144554781a8eae8dd140d6325503262dab7a (patch)
tree25899cab6178002a6112e39519e7baf076a5fc74 /synapse/storage
parentMerge pull request #1840 from matrix-org/erikj/current_state_fix (diff)
parentTypo (diff)
downloadsynapse-ba8e144554781a8eae8dd140d6325503262dab7a.tar.xz
Merge branch 'erikj/current_state_fix' into develop
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 599db4c9f0..8712d7e18c 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -379,7 +379,7 @@ class EventsStore(SQLBaseStore):
 
         Returns:
             2-tuple (to_delete, to_insert) where both are state dicts, i.e.
-            (type, state_key) -> event_id. `to_delete` are the entreis to
+            (type, state_key) -> event_id. `to_delete` are the entries to
             first be deleted from current_state_events, `to_insert` are entries
             to insert.
             May return None if there are no changes to be applied.