diff options
| author | David Baker <dave@matrix.org> | 2018-10-09 18:04:21 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-10-09 18:04:21 +0100 |
| commit | b8d9e108be60b3d14a57238562bfb5f49781c2a6 (patch) | |
| tree | 7c7ed96ac22ab1c369c7d0f39043f2ca409c436c /synapse/api/errors.py | |
| parent | Add changelog (diff) | |
| download | synapse-b8d9e108be60b3d14a57238562bfb5f49781c2a6.tar.xz | |
Fix mergefail
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 4124469442..0a6e78711f 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -344,7 +344,7 @@ class IncompatibleRoomVersionError(SynapseError): return cs_error( self.msg, self.errcode, - room_version=self.current_version, + room_version=self._room_version, ) |