diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
commit | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (patch) | |
tree | dfbcfb70609fd24074dad6686f447a452313c6c6 /mascara/test/test-ui.js | |
parent | 85fd75c21f0e64817b3d4c4d51f37649e3a81233 (diff) | |
parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
download | tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.gz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.bz2 tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.lz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.xz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.zst tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.zip |
fix merge conflicts
Diffstat (limited to 'mascara/test/test-ui.js')
-rw-r--r-- | mascara/test/test-ui.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mascara/test/test-ui.js b/mascara/test/test-ui.js index b9bc42dff..16b2c206a 100644 --- a/mascara/test/test-ui.js +++ b/mascara/test/test-ui.js @@ -1,5 +1,3 @@ -const Helper = require('./util/mascara-test-helper.js') - window.addEventListener('load', () => { window.METAMASK_SKIP_RELOAD = true // inject app container |