Fixing after react update

2023-05-05 23:10:06 +03:00
parent 21fa38cc4d
commit d069e56397
45 changed files with 550 additions and 31 deletions
@@ -7,8 +7,12 @@
    "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",