Fix leftover merge conflict markers in Chat.test.tsx

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Dave
2026-02-20 15:59:45 +00:00
parent 024fb2b4b8
commit 3e22654681

View File

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