diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-10-21 13:59:53 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-10-21 13:59:53 +0800 |
| commit | 9c1b2108f69334884473eb95758e2d1c02c984d6 (patch) | |
| tree | 93f5255399307a28cb9380dc23c275b406403929 /package.json | |
| parent | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (diff) | |
| parent | b0c649a4e3c68293e08e764bbf4d53939df88e2d (diff) | |
| download | tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.gz tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.bz2 tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.lz tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.xz tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.zst tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index ec13f058d..4114376a0 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "fast-levenshtein": "^2.0.6", "file-loader": "^1.1.11", "fuse.js": "^3.2.0", - "gulp": "github:gulpjs/gulp#4.0", + "gulp": "github:gulpjs/gulp#v4.0.0", "gulp-autoprefixer": "^5.0.0", "gulp-debug": "^3.2.0", "gulp-eslint": "^4.0.0", |