merge conflicts

This commit is contained in:
Eitan Seri- Levi
2026-04-03 09:26:40 -07:00
144 changed files with 8530 additions and 3436 deletions

View File

@@ -42,6 +42,6 @@ types = { workspace = true }
[dev-dependencies]
operation_pool = { workspace = true }
serde_yaml = { workspace = true }
state_processing = { workspace = true }
tokio = { workspace = true }
yaml_serde = { workspace = true }

View File

@@ -236,7 +236,7 @@ mod tests {
fn serde() {
let config = Config::default();
let serialized =
serde_yaml::to_string(&config).expect("should serde encode default config");
serde_yaml::from_str::<Config>(&serialized).expect("should serde decode default config");
yaml_serde::to_string(&config).expect("should serde encode default config");
yaml_serde::from_str::<Config>(&serialized).expect("should serde decode default config");
}
}