dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Fix unclosed delimiter from merge conflict resolution in agents.rs

Browse Source 
Remove leftover conflict markers and add missing closing brace for
watchdog_detects_orphaned_running_agent test function.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-24 13:22:11 +00:00
parent 6170a7d984
commit 580bac22fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/agents.rs
View File

@@ -5083,7 +5083,6 @@ theirs
assert!(report.had_conflicts, "should report conflicts"); assert!(report.had_conflicts, "should report conflicts");
} }
<<<<<<< HEAD
// ── process health monitoring tests ────────────────────────────────────── // ── process health monitoring tests ──────────────────────────────────────
/// Demonstrates that the PTY read-loop inactivity timeout fires when no output /// Demonstrates that the PTY read-loop inactivity timeout fires when no output
@@ -5161,7 +5160,8 @@ theirs
matches!(event, AgentEvent::Error { .. }), matches!(event, AgentEvent::Error { .. }),
"expected AgentEvent::Error, got: {event:?}" "expected AgentEvent::Error, got: {event:?}"
); );
======= }
// ── remove_agents_for_story tests ──────────────────────────────────────── // ── remove_agents_for_story tests ────────────────────────────────────────
#[test] #[test]