Fix a bad merge.

matrix-org · Sep 18, 2020 · 041119a · 041119a
1 parent 00db778
commit 041119a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/8354.misc b/changelog.d/8354.misc
@@ -0,0 +1 @@
+Fix bad merge from `release-v1.20.0` branch to `develop`.
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py
@@ -385,7 +385,7 @@ async def get_messages(
                         )
 
                 await self.hs.get_handlers().federation_handler.maybe_backfill(
-                    room_id, curr_topo, limit=source_config.limit,
+                    room_id, curr_topo, limit=pagin_config.limit,
                 )
 
             to_room_key = None