Merge remote-tracking branch 'origin/develop' into anoa/public_rooms_module_api github/anoa/public_rooms_module_api anoa/public_rooms_module_api

1 files changed, 0 insertions, 1 deletions

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

index 4cdf0a8502..97c9f01245 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -261,7 +261,6 @@ class RoomCreationHandler:
                 # in the meantime and context needs to be recomputed, so let's do so.
                 if i == max_retries - 1:
                     raise e
-                pass
 
         # This is to satisfy mypy and should never happen
         raise PartialStateConflictError()