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 /app/scripts/contentscript.js | |
parent | 85fd75c21f0e64817b3d4c4d51f37649e3a81233 (diff) | |
parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
download | tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.gz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.zst tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.zip |
fix merge conflicts
Diffstat (limited to 'app/scripts/contentscript.js')
-rw-r--r-- | app/scripts/contentscript.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 75e0a95b3..b35a70dd2 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -115,8 +115,8 @@ function logStreamDisconnectWarning (remoteLabel, err) { * @returns {boolean} {@code true} if Web3 should be injected */ function shouldInjectWeb3 () { - return doctypeCheck() && suffixCheck() - && documentElementCheck() && !blacklistedDomainCheck() + return doctypeCheck() && suffixCheck() && + documentElementCheck() && !blacklistedDomainCheck() } /** |