Resolve master merge conflicts.

2023-01-24 10:56:28 -08:00
parent 41c63cbfe9 162aeca7c8
commit c6087574be
21 changed files with 348 additions and 43177 deletions
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
    "npm": ">=8.0.0"
  },
  "scripts": {
-    "setup": "yarn && cd client && yarn",
+    "setup": "rm -rf node_modules && yarn && cd client && rm -rf node_modules && yarn",
    "admin": "cd admin && yarn start",
    "client": "cd client && yarn start",
    "server": "nodemon server.js",