Fix missed conflict res

Author: pfrazee

scripts/package.json

@@ -94,11 +94,7 @@
  "burnthemall": "node ./tasks/burnthemall.js",
  "lint": "eslint --ignore-pattern 'color-thief.js' --ignore-pattern 'app/node_modules' --ignore-pattern 'vendor' --ignore-pattern '*.build.js' --ignore-pattern 'assets' --fix app",
  "rebuild": "gulp rebuild",
-<<<<<<< HEAD:package.json
- "release": "npm run build && electron-builder -p never && gulp postbuild",
-=======
  "release": "electron-builder -p never && gulp postbuild",
->>>>>>> blue-hyperdrive10:scripts/package.json
  "start": "gulp start",
  "watch": "gulp start-watch"
  },