summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-16 11:34:53 +0100
committerErik Johnston <erik@matrix.org>2020-10-16 11:34:53 +0100
commite9b5e642c3d090abe03f9a86ac1060705e1eecb6 (patch)
treec577ae08545b4419e99b9802501f5187d5e36fe0 /synapse/handlers/sync.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #8535 from matrix-org/rav/third_party_events_updates (diff)
downloadsynapse-e9b5e642c3d090abe03f9a86ac1060705e1eecb6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 01b3bc27e9..c4a025da34 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import itertools import logging from typing import TYPE_CHECKING, Any, Dict, FrozenSet, List, Optional, Set, Tuple