diff options
| author | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
|---|---|---|
| committer | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
| commit | 94d1d846fb57932fd1e959f53dbf6444f0789e91 (patch) | |
| tree | 369276cd66bdcae85cac77b2c9b2458de5b08dd7 /test/mascara.conf.js | |
| parent | c94f639de55a867ebe8d3599d337a1f7341b1979 (diff) | |
| parent | fd218142acb6dab0b2f921b9729f17ff90cffc2d (diff) | |
| download | tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.gz tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.zst tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.zip | |
Merge branch 'develop' into contextTypes
# Conflicts:
# ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
Diffstat (limited to 'test/mascara.conf.js')
| -rw-r--r-- | test/mascara.conf.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mascara.conf.js b/test/mascara.conf.js index 97e53fc2b..faf3147bd 100644 --- a/test/mascara.conf.js +++ b/test/mascara.conf.js @@ -1,13 +1,13 @@ const getBaseConfig = require('./base.conf.js') -module.exports = function(config) { +module.exports = function (config) { const settings = getBaseConfig(config) // ui and tests settings.files.push('dist/mascara/ui.js') settings.files.push('dist/mascara/tests.js') // service worker background - settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true }), + settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true }) settings.proxies['/background.js'] = '/base/dist/mascara/background.js' // use this to keep the browser open for debugging |