diff options
author | Esteban MIno <efmino@uc.cl> | 2018-08-29 02:20:30 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-08-29 02:20:30 +0800 |
commit | e743f44150d4c09908d24945de5a281e15e8469d (patch) | |
tree | 76984504e65b06ae15633d721fedc7ddd5b0cca7 /app/scripts/lib/ipfsContent.js | |
parent | 3106374cc31b66e5a0faadd657b4430e21aa48b2 (diff) | |
parent | 0259eb02140fec1db9861506a6ff7890911af652 (diff) | |
download | tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.tar.gz tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.tar.zst tangerine-wallet-browser-e743f44150d4c09908d24945de5a281e15e8469d.zip |
fix conflicts
Diffstat (limited to 'app/scripts/lib/ipfsContent.js')
-rw-r--r-- | app/scripts/lib/ipfsContent.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/lib/ipfsContent.js b/app/scripts/lib/ipfsContent.js index 5db63f47d..38682b916 100644 --- a/app/scripts/lib/ipfsContent.js +++ b/app/scripts/lib/ipfsContent.js @@ -34,7 +34,7 @@ module.exports = function (provider) { return { cancel: true } } - extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']}) + extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/']}) return { remove () { |