message: update merge conflict
diff: "tslint": "tslint --project . --exclude common/vendor/**/*",
  "tscheck": "tsc --noEmit",
  "start": "npm run dev",
  -<<<<<<< HEAD
  -=======
  - "precommit": "lint-staged",
  ->>>>>>> develop
  "formatAll":
  "find ./common/ -name '*.ts*' | xargs prettier --write --config ./.prettierrc --config-precedence file-override",
  "prettier:diff":
  "prettier --write --config ./.prettierrc --list-different \"common/**/*.ts\" \"common/**/*.tsx\"",
  -<<<<<<< HEAD
  -=======
  - "prepush": "npm run tslint && npm run tscheck",
  ->>>>>>> develop
  "update:tokens": "ts-node scripts/update-tokens",
  "postinstall": "electron-rebuild --force"
  },
  "common/store.ts",
  "common/libs/decrypt.ts",
  "common/libs/signing.ts"
  -<<<<<<< HEAD
  ],
  "husky": {
  "hooks": {
  "pre-commit": "lint-staged && npm run tscheck && npm test"
  }
  }
  -=======
  - ]
  ->>>>>>> develop
  }
  