summary refs log tree commit diff
path: root/synapse/events/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-03-11 17:07:31 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-03-11 17:07:31 +0000
commita8a028dfce9a4eb9d55da74d8ab5c2a959c06d50 (patch)
tree667aeddb2f358db7c53ea2d81fd2f5bc1534db92 /synapse/events/__init__.py
parentlint (diff)
parentMerge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff)
downloadsynapse-a8a028dfce9a4eb9d55da74d8ab5c2a959c06d50.tar.xz
Merge branch 'develop' into anoa/trailing_slashes_client
Diffstat (limited to 'synapse/events/__init__.py')
-rw-r--r--synapse/events/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py
index bd130f8816..fafa135182 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -141,7 +141,6 @@ class EventBase(object):
     origin = _event_dict_property("origin")
     origin_server_ts = _event_dict_property("origin_server_ts")
     prev_events = _event_dict_property("prev_events")
-    prev_state = _event_dict_property("prev_state")
     redacts = _event_dict_property("redacts")
     room_id = _event_dict_property("room_id")
     sender = _event_dict_property("sender")