diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-07-07 13:56:07 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-07-07 13:56:07 +0800 |
| commit | a1fdf28a7bff23a1d084da8a91909aeaa969bb73 (patch) | |
| tree | 5ff51a4a10d339ec51036a18a23bfa7bee869921 /app/scripts/inpage.js | |
| parent | 9e0d9b88ccf4348ab9ac21f8fc3d64738dac5b40 (diff) | |
| parent | ecfe720b8bb0429c2d73b3a03d5dbf1d7cf573a7 (diff) | |
| download | tangerine-wallet-browser-a1fdf28a7bff23a1d084da8a91909aeaa969bb73.tar.gz tangerine-wallet-browser-a1fdf28a7bff23a1d084da8a91909aeaa969bb73.tar.zst tangerine-wallet-browser-a1fdf28a7bff23a1d084da8a91909aeaa969bb73.zip | |
Merge branch 'master' into ConfirmationStyle
Diffstat (limited to 'app/scripts/inpage.js')
| -rw-r--r-- | app/scripts/inpage.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index e6f4078c8..f5e54cd7b 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -1,12 +1,11 @@ +/*global Web3*/ cleanContextForImports() -const Web3 = require('web3') +require('web3/dist/web3.min.js') const LocalMessageDuplexStream = require('./lib/local-message-stream.js') const setupDappAutoReload = require('./lib/auto-reload.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js') restoreContextAfterImports() -// remove from window -delete window.Web3 // // setup plugin communication |