From b8d9e108be60b3d14a57238562bfb5f49781c2a6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 9 Oct 2018 18:04:21 +0100
Subject: Fix mergefail

---
 synapse/api/errors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,
         )
 
 
-- 
cgit 1.4.1