mirror of
https://github.com/block/buzz.git
synced 2026-11-02 07:22:55 +00:00
Conflict resolution and compile fixes: - tests.rs: take main's side (fixture extracted to test_fixtures.rs by #4053), preserve our comment reword on marker_entry_is_namespaced_by_instance_id - test_fixtures.rs: auto-merged as main's version; add effort_level: None (same class as last round's parallelism.rs fix) No other ManagedAgentRecord literals required patching (cargo check clean). Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>