package

2023-05-06 11:41:53 +03:00
parent d069e56397
commit ec32a6954b
1 changed files with 0 additions and 5 deletions
@@ -7,12 +7,7 @@
    "start": "node server",
    "server": "nodemon server",
    "client": "npm start --prefix client --trace-depracation",
-<<<<<<< HEAD
    "dev": "concurrently \"npm run server\" \"npm run client\""
-=======
-    "dev": "concurrently \"npm run server\" \"npm run client\"",
-    "heroku-postbuild":"NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client"
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
  },
  "author": "",
  "license": "ISC",