diff options
| author | Jonathan de Jong <jonathan@automatia.nl> | 2021-07-15 12:02:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 11:02:43 +0100 |
| commit | bf72d10dbf506f5ea486d67094b6003947d38fb7 (patch) | |
| tree | b7890a287d8fea6488797f6c2659082c4f7532db /synapse/state/v1.py | |
| parent | Allow providing credentials to `http_proxy` (#10360) (diff) | |
| download | synapse-bf72d10dbf506f5ea486d67094b6003947d38fb7.tar.xz | |
Use inline type hints in various other places (in `synapse/`) (#10380)
Diffstat (limited to 'synapse/state/v1.py')
| -rw-r--r-- | synapse/state/v1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state/v1.py b/synapse/state/v1.py index 318e998813..267193cedf 100644 --- a/synapse/state/v1.py +++ b/synapse/state/v1.py @@ -159,7 +159,7 @@ def _seperate( """ state_set_iterator = iter(state_sets) unconflicted_state = dict(next(state_set_iterator)) - conflicted_state = {} # type: MutableStateMap[Set[str]] + conflicted_state: MutableStateMap[Set[str]] = {} for state_set in state_set_iterator: for key, value in state_set.items(): |