diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-09-11 01:16:37 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-09-11 01:16:37 +0800 |
| commit | 26333ee83063f1c21fdabc63b9f20e0cc4a60181 (patch) | |
| tree | c82226c77eacbb1869fa6a1e8ed4d3d24e93029e /package-lock.json | |
| parent | a299641a95953f99e33b25fc7583c495b82c0322 (diff) | |
| parent | fdb023381be323bd3198d5e102447e6591e7e73e (diff) | |
| download | tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.gz tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.bz2 tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.lz tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.xz tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.zst tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.zip | |
fix merge conflicts
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/package-lock.json b/package-lock.json index 131541c71..cee8b15ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7658,9 +7658,15 @@ } }, "enzyme-adapter-utils": { +<<<<<<< HEAD "version": "1.7.0", "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.7.0.tgz", "integrity": "sha512-K5FVpGxMlakvvWS6TkwogAzvMRE4pgve6grPzCuraVHRBzgrmeasGDF1CS2rQc7uKo7OF0FQZxaQm8oJAKXFVw==", +======= + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.0.tgz", + "integrity": "sha512-K9U2RGr1pvWPGEAIRQRVH4UdlqzpfLsKonuHyAK6lxu46yfGsMDVlO3+YvQwQpVjVw8eviEVIOmlFAnMbIhv/w==", +>>>>>>> fdb023381be323bd3198d5e102447e6591e7e73e "dev": true, "requires": { "function.prototype.name": "^1.1.0", |