fix package-lock.json merge

pull/4378/head
Conduitry 6 years ago
parent 2a1fa7fdd8
commit deb765e4d4

12
package-lock.json generated

@ -597,9 +597,9 @@
"dev": true
},
"code-red": {
"version": "0.0.32",
"resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.32.tgz",
"integrity": "sha512-mE+EZc2vJ4HxiejW5S2CvcVDKtopFEmrqAd9DTBDLCNjLgxekPP8wLi/ZiwDTwZwwW3dzeetaubLaMlIvkhVNw==",
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/code-red/-/code-red-0.1.1.tgz",
"integrity": "sha512-2pEIyya4fxI9HxQcrl9dJl20+9He1nLeja50zkf7gK2OTTV9NpD3CgA74gzXnPqWv2zJpa6uXNSaE0haOCpOsw==",
"dev": true,
"requires": {
"acorn": "^7.1.0",
@ -2909,12 +2909,6 @@
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
"dev": true
},
"prettier": {
"version": "1.19.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
"integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
"dev": true
},
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",

Loading…
Cancel
Save