Permalink
Browse files

chore: fix lint on pre-commit with lint-staged, use npm-merge-driver (#…

…5591)

run vjsstandard --fix on pre-commit on staged files via lint-staged.
Install npm-merge-driver to fix package-lock issues during merges and rebases.
  • Loading branch information...
BrandonOCasey authored and gkatsev committed Nov 16, 2018
1 parent 2162239 commit be9e9a93db4e1b5fa39068fd79134cea2f10097e
Showing with 1,196 additions and 141 deletions.
  1. +1,187 −140 package-lock.json
  2. +9 −1 package.json
Oops, something went wrong.

0 comments on commit be9e9a9

Please sign in to comment.