resolve coflicts

cohere-ai · May 23, 2024 · cb41467 · cb41467
2 parents cc50e45 + 658332d
commit cb41467
Show file tree

Hide file tree

Showing 15 changed files with 663 additions and 399 deletions.
diff --git a/src/interfaces/coral_web/.env.development b/src/interfaces/coral_web/.env.development
@@ -1,3 +1,3 @@
 # Client
-NEXT_PUBLIC_API_HOSTNAME=http://backend:8000
+NEXT_PUBLIC_API_HOSTNAME=http://localhost:8000
 NEXT_PUBLIC_HAS_CUSTOM_LOGO=false
diff --git a/src/interfaces/coral_web/package-lock.json b/src/interfaces/coral_web/package-lock.json
diff --git a/src/interfaces/coral_web/package.json b/src/interfaces/coral_web/package.json
@@ -40,7 +40,7 @@
     "lodash": "^4.17.21",
     "match-sorter": "^6.3.1",
     "mdast-util-to-string": "^4.0.0",
-    "next": "^13.4.9",
+    "next": "^14.1.1",
     "node-html-parser": "^6.1.4",
     "openapi-typescript-codegen": "^0.27.0",
     "parse-domain": "^8.0.1",