From 3e22654681bd4ffc6e8ae535fb28a0a6c82ab55f Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Fri, 20 Feb 2026 15:59:45 +0000
Subject: [PATCH] Fix leftover merge conflict markers in Chat.test.tsx

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

diff --git a/frontend/src/components/Chat.test.tsx b/frontend/src/components/Chat.test.tsx
index 0938ad2..7d11c99 100644
--- a/frontend/src/components/Chat.test.tsx
+++ b/frontend/src/components/Chat.test.tsx
@@ -766,7 +766,6 @@ describe("Chat message rendering — unified tool call UI", () => {
 			capturedWsHandlers?.onUpdate(messages);
 		});
 
-<<<<<<< HEAD
 		expect(await screen.findByText("Bash(cargo test)")).toBeInTheDocument();
 		expect(await screen.findByText("Read(Cargo.toml)")).toBeInTheDocument();
 	});
@@ -855,6 +854,5 @@ describe("Chat two-column layout", () => {
 			configurable: true,
 			value: 1024,
 		});
->>>>>>> 222b581 (Story 48: Two Column Layout — Chat Left, Panels Right)
 	});
 });