diff options
| author | Daisuke KONISHI <skydai1151@gmail.com> | 2019-07-17 03:05:58 +0300 |
|---|---|---|
| committer | Daisuke KONISHI <skydai1151@gmail.com> | 2019-07-17 03:05:58 +0300 |
| commit | 0e756d1dfaf725c721ac4813d2934e8c631eba44 (patch) | |
| tree | 3317ba49fc5391bc1e4d1b592908c86d173c576e /package-lock.json | |
| parent | dd7862b8587203e39af025e574d0def56aa66d17 (diff) | |
update some package
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/package-lock.json b/package-lock.json index 7fd0f31..9190849 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,15 +11,9 @@ "dev": true }, "@types/node": { -<<<<<<< HEAD "version": "12.6.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.5.tgz", "integrity": "sha512-8IUaNE8dbiVyv6wdi3mgrxZ9IYfDaulRY8A2MKiDugYj/tjPz/+JdwuC/uuBlGb+yTapiTratHfksPCy8trPQg==", -======= - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.5.tgz", - "integrity": "sha512-CFLSALoE+93+Hcb5pFjp0J1uMrrbLRe+L1+gFwerJ776R3TACSF0kTVRQ7AvRa7aFx70nqYHAc7wQPlt9kY2Mg==", ->>>>>>> 5ce3c454845bb87e5386b089f05ba2497b6951ec "dev": true }, "abbrev": { @@ -1343,15 +1337,9 @@ } }, "eslint-plugin-import": { -<<<<<<< HEAD "version": "2.18.0", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz", "integrity": "sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==", -======= - "version": "2.17.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz", - "integrity": "sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==", ->>>>>>> 5ce3c454845bb87e5386b089f05ba2497b6951ec "dev": true, "requires": { "array-includes": "^3.0.3", |