Skip to content

Commit

Permalink
Resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
vodorok committed Mar 13, 2023
1 parent b6fa414 commit 8c29958
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions web/server/vue-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"private": true,
"scripts": {
"build": "rimraf dist && cross-env NODE_ENV=production webpack --config config/webpack.prod.js",
"build-dev": "rimraf dist && cross-env NODE_ENV=development webpack --config config/webpack.dev.js",
"server:codechecker": "CodeChecker server -w ~/.codechecker > e2e/__codechecker/server.log",
"server:codechecker": "CodeChecker server --port 8002 -w e2e/__codechecker/workspace > e2e/__codechecker/server.log",
"server:dev": "cross-env NODE_ENV=development webpack server --hot --progress --config config/webpack.dev.js",
"server:prod": "http-server dist -c-1 --cors",
"server": "npm run server:dev",
Expand Down

0 comments on commit 8c29958

Please sign in to comment.