Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into unify_param_names
Browse files Browse the repository at this point in the history
  • Loading branch information
Lachlan Whitehead committed Aug 29, 2024
2 parents 9f2cea7 + f57b489 commit a2106dd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions core/lls_core/cmds/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ def field_from_model(model: Type[FieldAccessModel], field_name: str, extra_descr
def handle_merge(values: list):
if len(values) > 1:
if all(isinstance(param, dict) for param in values):
merged = merge_with(handle_merge,values)
values = [merged]
return merge_with(handle_merge, values)
else:
raise ValueError(f"A parameter has been passed multiple times! Got: {', '.join(values)}")
return values[0]
Expand Down

0 comments on commit a2106dd

Please sign in to comment.