diff --git a/package-lock.json b/package-lock.json index 2777e40..1d2de05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "responsive-html-email-signature", - "version": "5.1.1", + "version": "6.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5188,6 +5188,7 @@ } } }, +<<<<<<< HEAD <<<<<<< HEAD "gulp-cli": { "version": "2.2.0", @@ -5313,6 +5314,8 @@ } } }, +======= +>>>>>>> Remove unused package "gulp-david": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-david/-/gulp-david-1.0.1.tgz", diff --git a/package.json b/package.json index 0a6fb33..9bbb218 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "husky": { "hooks": { "pre-push": "npm test", - "pre-commit": "npm run lint && pretty-quick --staged --pattern ./**/*.js" + "pre-commit": "npm run lint && ./node_modules/.bin/pretty-quick --staged --pattern ./**/*.js" } } }