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 /gulpfile.js | |
| parent | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (diff) | |
| parent | b0c649a4e3c68293e08e764bbf4d53939df88e2d (diff) | |
| download | tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.gz tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.tar.zst tangerine-wallet-browser-9c1b2108f69334884473eb95758e2d1c02c984d6.zip | |
fix merge conflicts
Diffstat (limited to 'gulpfile.js')
| -rw-r--r-- | gulpfile.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gulpfile.js b/gulpfile.js index f26fff995..c3d9019ff 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -466,7 +466,9 @@ function generateBundler (opts, performBundle) { bundler.transform(envify({ METAMASK_DEBUG: opts.devMode, NODE_ENV: opts.devMode ? 'development' : 'production', - })) + }), { + global: true, + }) if (opts.watch) { bundler = watchify(bundler) |