story-kit: merge 133_story_clean_up_agent_state_on_story_archive_and_add_ttl_for_completed_entries

2026-02-24 13:22:15 +00:00
parent 580bac22fa
commit 518d5335d2
1 changed files with 1 additions and 1 deletions
--- a/server/src/agents.rs
+++ b/server/src/agents.rs
@@ -4806,7 +4806,6 @@ ours
    #[test]
    fn resolve_simple_conflicts_malformed_no_end() {
        let input = "\
-<<<<<<< HEAD
 ours
 theirs
 ";
@@ -5083,6 +5082,7 @@ theirs
        assert!(report.had_conflicts, "should report conflicts");
    }

+<<<<<<< HEAD
    // ── process health monitoring tests ──────────────────────────────────────

    /// Demonstrates that the PTY read-loop inactivity timeout fires when no output