rei-mirrors/synapse
1
0
Fork 0
mirror of https://github.com/matrix-org/synapse.git synced 2025-01-13 03:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update comment on merged

Browse Source
This commit is contained in:
Olivier Wilkinson (reivilibre) 2023-12-06 15:17:55 +00:00
parent a0d1348309
commit 3318722753
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/configure_workers_and_start.py
View File

@ -358,7 +358,8 @@ def merge_into(dest: Any, new: Any) -> None:
def merged(a: Dict[str, Any], b: Dict[str, Any]) -> Dict[str, Any]: def merged(a: Dict[str, Any], b: Dict[str, Any]) -> Dict[str, Any]:
""" """
Merges `b` into `a` and returns `a`. Merges `b` into `a` and returns `a`. Here because we can't use `merge_into`
in a lamba conveniently.
""" """
merge_into(a, b) merge_into(a, b)
return a return a