Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
fix merge error
Browse files Browse the repository at this point in the history
... Introduced in #10566
  • Loading branch information
richvdh committed Sep 6, 2021
1 parent 1ea1b7a commit 7616d87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion synapse/handlers/federation_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ async def _handle_marker_event(self, origin: str, marker_event: EventBase):
room_creator = create_event.content.get(EventContentFields.ROOM_CREATOR)
if (
not room_version.msc2716_historical
or not self.config.experimental.msc2716_enabled
or not self._config.experimental.msc2716_enabled
or marker_event.sender != room_creator
):
return
Expand Down

0 comments on commit 7616d87

Please sign in to comment.