diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
commit | 69f4c8c336a0f2fad2027c4a5f76e28a976b5e75 (patch) | |
tree | c34647abca3a765d525e222855a7a93f4658f800 /app/scripts/ui.js | |
parent | d4a15f22c24074f44daa9eeb4fda192ea3742792 (diff) | |
parent | e715d0e6915a9bb0ac69db06144253ddff54ba44 (diff) | |
download | tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.gz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.bz2 tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.lz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.xz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.zst tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.zip |
fix merge conflicts
Diffstat (limited to 'app/scripts/ui.js')
-rw-r--r-- | app/scripts/ui.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/ui.js b/app/scripts/ui.js index 9bf97be87..da100f928 100644 --- a/app/scripts/ui.js +++ b/app/scripts/ui.js @@ -64,7 +64,6 @@ async function start () { css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() deleteInjectedCss = injectCss(css) } - if (state.appState.shouldClose) notificationManager.closePopup() }) }) |