merge conflicts

2023-01-31 15:09:35 +01:00
parent dc2b25f152
commit ca3bfc859a
108 changed files with 1112 additions and 668 deletions
@@ -58,7 +58,7 @@ impl MixNode {
    }

    fn load_node_description(config: &Config) -> NodeDescription {
-        NodeDescription::load_from_file(Config::default_config_directory(Some(&config.get_id())))
+        NodeDescription::load_from_file(Config::default_config_directory(&config.get_id()))
            .unwrap_or_default()
    }