summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2022-11-17 16:28:56 +0000
committerErik Johnston <erik@matrix.org>2022-11-17 16:28:56 +0000
commitfc65cd98a60d3e23653551de093ec0053dff7ca3 (patch)
tree622bf701d64cdf2b618b307bbf8aa1438e17c259
parentImplement closure of conflicted state events (diff)
downloadsynapse-erikj/state_res_v2.1_clousre.tar.xz
-rw-r--r--synapse/state/v2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/v2.py b/synapse/state/v2.py
index e15cfbd4b3..3353b55e30 100644
--- a/synapse/state/v2.py
+++ b/synapse/state/v2.py
@@ -387,7 +387,7 @@ async def _get_auth_chain_difference(
             if not auth_chain:
                 continue
 
-            conflicted_boundary != auth_chain & boundary
+            conflicted_boundary |= auth_chain & boundary
 
     else:
         auth_difference_unpersisted_part = ()