#263 - Resolved conflicts for merge

Seneca-CDOT · Nov 28, 2019 · 85a65f2 · 85a65f2
1 parent d837d72
commit 85a65f2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -24,7 +24,10 @@
     "test": "npm run jest",
     "jest": "cross-env MOCK_REDIS=1 jest",
     "jest-watch": "cross-env MOCK_REDIS=1 jest --watch",
-    "start": "node src",
+    "start": "node src/backend",
+    "server": "node src/backend/web/server",
+    "hint": "hint http://localhost:3000",
+    "webhint": "cross-env PORT=3000 npm-run-all -r -p server hint",
     "debug-server": "nodemon server.js"
   },
   "husky": {