Merge branch 'release-v1.18.0' into matrix-org-hotfixes

1 files changed, 0 insertions, 4 deletions

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 99dd4ee948..c308647700 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -424,10 +424,6 @@ class SyncHandler(object):
         potential_recents: Optional[List[EventBase]] = None,
         newly_joined_room: bool = False,
     ) -> TimelineBatch:
-        """
-        Returns:
-            a Deferred TimelineBatch
-        """
         with Measure(self.clock, "load_filtered_recents"):
             timeline_limit = sync_config.filter_collection.timeline_limit()
             block_all_timeline = (