From d278c194fd49affbcc5c6acb9ee1952049cad2a5 Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:19:38 +0000
Subject: [PATCH] fix: remove stray conflict marker in AgentPanel.test.tsx

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 frontend/src/components/AgentPanel.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/AgentPanel.test.tsx b/frontend/src/components/AgentPanel.test.tsx
index 8dd10b5..dd156e6 100644
--- a/frontend/src/components/AgentPanel.test.tsx
+++ b/frontend/src/components/AgentPanel.test.tsx
@@ -66,7 +66,6 @@ describe("AgentPanel active work list removed", () => {
 		expect(
 			container.querySelector('[data-testid^="agent-entry-"]'),
 		).not.toBeInTheDocument();
-<<<<<<< HEAD
 	});
 });