Fix a bad merge.

clokep · clokep · commit 041119a0e9d2 · 2020-09-18T11:42:01.000-04:00
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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix bad merge from `release-v1.20.0` branch to `develop`.
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ async def get_messages(`
`385`	`385`	`)`
`386`	`386`
`387`	`387`	`await self.hs.get_handlers().federation_handler.maybe_backfill(`
`388`		`- room_id, curr_topo, limit=source_config.limit,`
	`388`	`+ room_id, curr_topo, limit=pagin_config.limit,`
`389`	`389`	`)`
`390`	`390`
`391`	`391`	`to_room_key = None`