fix: Resolve merge conflict in server/mod.rsmakima/discuss-contract-feature

Combine imports from both branches - include both chains and contract_discuss handlers.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/makima/frontend/src/main.tsx b/makima/frontend/src/main.tsx
index 50fffe4..a7ba1a3 100644
--- a/makima/frontend/src/main.tsx
+++ b/makima/frontend/src/main.tsx
@@ -12,6 +12,7 @@ import HomePage from "./routes/_index";
 import ListenPage from "./routes/listen";
 import FilesPage from "./routes/files";
 import ContractsPage from "./routes/contracts";
+import ChainsPage from "./routes/chains";
 import WorkflowPage from "./routes/workflow";
 import MeshPage from "./routes/mesh";
 import HistoryPage from "./routes/history";
@@ -72,6 +73,22 @@ createRoot(document.getElementById("root")!).render(
             }
           />
           <Route
+            path="/chains"
+            element={
+              <ProtectedRoute>
+                <ChainsPage />
+              </ProtectedRoute>
+            }
+          />
+          <Route
+            path="/chains/:id"
+            element={
+              <ProtectedRoute>
+                <ChainsPage />
+              </ProtectedRoute>
+            }
+          />
+          <Route
             path="/contracts/:id/files/:fileId"
             element={
               <ProtectedRoute>