Update the merge to version 1.2.1

This commit is contained in:
lionsoul 2018-11-03 11:05:48 +08:00
parent 0809f9eda8
commit 8688ae3ecb
1 changed files with 3 additions and 3 deletions

View File

@ -964,7 +964,7 @@
"integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==", "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
"dev": true, "dev": true,
"requires": { "requires": {
"merge": "^1.2.0" "merge": "^1.2.1"
} }
}, },
"expand-brackets": { "expand-brackets": {
@ -2211,8 +2211,8 @@
"dev": true "dev": true
}, },
"merge": { "merge": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
"integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
"dev": true "dev": true
}, },