Merge: Resolve conflicts by accepting incoming changes

2025-10-18 21:18:46 -05:00 · 2025-10-18 21:18:46 -05:00 · 2d7637ebcf
commit 2d7637ebcf
parent 4989d30ec3 848f27b29b
21 changed files with 133 additions and 180 deletions
--- a/web-app/src/components/layouts/chat-layout.jsx
+++ b/web-app/src/components/layouts/chat-layout.jsx
@ -25,7 +25,7 @@ export default function ChatLayout() {
  }

  return (
-    <div className="flex flex-col h-[80vh] w-full max-w-3xl mx-auto rounded-lg overflow-hidden shadow-lg border border-slate-700">
+    <div className="flex flex-col">
      <ChatHeader />
      <ChatWindow messages={messages} />
      <MessageInput onSend={handleSend} />
--- a/web-app/src/components/layouts/dashboard-layout.jsx
+++ b/web-app/src/components/layouts/dashboard-layout.jsx