From e2ff93a88a5845fab14c8c9fefe21811430ab7c9 Mon Sep 17 00:00:00 2001
From: "Christian Y. Brenninkmeijer"
 <christian.brenninkmeijer@manchester.ac.uk>
Date: Mon, 11 Sep 2023 17:05:38 +0100
Subject: [PATCH] fix merge

---
 .../interface/interface_functions/virtual_machine_generator.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spinn_front_end_common/interface/interface_functions/virtual_machine_generator.py b/spinn_front_end_common/interface/interface_functions/virtual_machine_generator.py
index 03e0950ff2..50caf53257 100644
--- a/spinn_front_end_common/interface/interface_functions/virtual_machine_generator.py
+++ b/spinn_front_end_common/interface/interface_functions/virtual_machine_generator.py
@@ -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)