chore: manually fix merge conflicts

AmazeeLabs · Apr 10, 2024 · 695dd8e · 695dd8e
1 parent 7eea981
commit 695dd8e
Show file tree

Hide file tree

Showing 2 changed files with 514 additions and 38 deletions.
diff --git a/apps/website/package.json b/apps/website/package.json
@@ -15,6 +15,10 @@
     "@custom/decap": "workspace:*",
     "@custom/schema": "workspace:*",
     "@custom/ui": "workspace:*",
+    "@gatsbyjs/reach-router": "^2.0.1",
+    "@netlify/plugin-nextjs": "^5.0.0",
+    "babel-loader": "^9.1.3",
+    "body-parser": "^1.20.2",
     "gatsby": "^5.13.1",
     "gatsby-plugin-layout": "^4.13.0",
     "gatsby-plugin-manifest": "^5.13.0",