huskies: merge 1016

2026-05-13 23:46:30 +00:00
parent 5ed1438ab9
commit 29e800da21
10 changed files with 180 additions and 568 deletions
@@ -7,7 +7,6 @@ mod merge;
 /// TransitionFired subscriber that auto-spawns mergemaster on ConflictDetected merge failures.
 pub(crate) mod merge_failure_subscriber;
 mod pipeline;
-mod reconcile;
 mod scan;
 mod story_checks;
 pub(crate) mod watchdog;