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

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Velten committed Dec 13, 2022
1 parent 0d283e4 commit bbc57e7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion synapse/handlers/room.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
from synapse.module_api import NOT_SPAM
from synapse.rest.admin._base import assert_user_is_admin
from synapse.storage.databases.main.events import PartialStateConflictError
from synapse.storage.state import StateFilter
from synapse.streams import EventSource
from synapse.types import (
JsonDict,
Expand Down
1 change: 0 additions & 1 deletion synapse/handlers/room_member.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from synapse.logging import opentracing
from synapse.module_api import NOT_SPAM
from synapse.storage.databases.main.events import PartialStateConflictError
from synapse.storage.state import StateFilter
from synapse.types import (
JsonDict,
Requester,
Expand Down

0 comments on commit bbc57e7

Please sign in to comment.