Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B committed Sep 11, 2023
1 parent 6023f3d commit e2ff93a
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def virtual_machine_generator() -> Machine:
version is not None or
not is_config_none("Machine", "down_chips") or
not is_config_none("Machine", "down_cores") or
mot is_config_none("Machine", "down_links"):
not is_config_none("Machine", "down_links")):
logger.warning("As json_path specified all other virtual "
"machine settings ignored.")
machine = json_machine.machine_from_json(json_path)
Expand Down

0 comments on commit e2ff93a

Please sign in to comment.