Skip to content

Commit 7fa29b2

Browse files
Merge pull request #137 from thiagobustamante/snyk-fix-f17c93225da91f8c744bd1027a684e29
[Snyk] Security upgrade merge from 1.2.1 to 2.1.1
2 parents d5c28fb + 65a3fc2 commit 7fa29b2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"fs-extra-promise": "^1.0.1",
3535
"glob": "^7.1.6",
3636
"lodash": "^4.17.20",
37-
"merge": "^1.2.1",
37+
"merge": "^2.1.1",
3838
"minimatch": "^3.0.4",
3939
"mkdirp": "^1.0.4",
4040
"path": "^0.12.7",

0 commit comments

Comments
 (0)