From 580bac22faab3deab7971774ee9a34436f765bc4 Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Tue, 24 Feb 2026 13:22:11 +0000
Subject: [PATCH] Fix unclosed delimiter from merge conflict resolution in
 agents.rs

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>
---
 server/src/agents.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/agents.rs b/server/src/agents.rs
index 800bb32..b0c9a14 100644
--- a/server/src/agents.rs
+++ b/server/src/agents.rs
@@ -5083,7 +5083,6 @@ 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
@@ -5161,7 +5160,8 @@ theirs
             matches!(event, AgentEvent::Error { .. }),
             "expected AgentEvent::Error, got: {event:?}"
         );
-=======
+    }
+
     // ── remove_agents_for_story tests ────────────────────────────────────────
 
     #[test]