diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
| commit | 1e9c0a9db2d58e61361bff7430d3a74006ef131c (patch) | |
| tree | 1d1f09bfe2e1985c42d5a117e8e63d19c71a360b /mascara/server/util.js | |
| parent | a387def701303e56f721fdc7c716e72641bfaf8f (diff) | |
| parent | 19afb638194a11367250153a710d77011665132a (diff) | |
| download | tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.gz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.bz2 tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.lz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.xz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.zst tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.zip | |
Resolve merge conflicts
Diffstat (limited to 'mascara/server/util.js')
| -rw-r--r-- | mascara/server/util.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mascara/server/util.js b/mascara/server/util.js index 6ab41b729..af2daddb9 100644 --- a/mascara/server/util.js +++ b/mascara/server/util.js @@ -23,7 +23,7 @@ function createBundle (entryPoint) { cache: {}, packageCache: {}, plugin: [watchify], - }) + }).transform('babelify') bundler.on('update', bundle) bundle() |