aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/background.js
diff options
context:
space:
mode:
authorEsteban MIno <efmino@uc.cl>2018-08-22 07:14:49 +0800
committerEsteban MIno <efmino@uc.cl>2018-08-22 07:14:49 +0800
commit4e6c71e969d9d681eb50d87502d765aa28959339 (patch)
treed00ac67ea84c6ece34eddea0ed257c007cdeb98a /app/scripts/background.js
parent6ccf2811e75924d7e92793df7e4ec915770cf6b4 (diff)
parentbabd59a2dc64e15ef2a415e349ef12d5b995e2e7 (diff)
downloadtangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.gz
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.bz2
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.lz
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.xz
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.tar.zst
tangerine-wallet-browser-4e6c71e969d9d681eb50d87502d765aa28959339.zip
Merge branch 'develop' into WatchTokenFeature
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r--app/scripts/background.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 1913d35dd..546fef569 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -15,7 +15,7 @@ const asStream = require('obs-store/lib/asStream')
const ExtensionPlatform = require('./platforms/extension')
const Migrator = require('./lib/migrator/')
const migrations = require('./migrations/')
-const PortStream = require('./lib/port-stream.js')
+const PortStream = require('extension-port-stream')
const createStreamSink = require('./lib/createStreamSink')
const NotificationManager = require('./lib/notification-manager.js')
const MetamaskController = require('./metamask-controller')