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/popup-core.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 'app/scripts/popup-core.js')
| -rw-r--r-- | app/scripts/popup-core.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js index 6325b8a8d..db885ec93 100644 --- a/app/scripts/popup-core.js +++ b/app/scripts/popup-core.js @@ -12,7 +12,7 @@ module.exports = initializePopup /** * Asynchronously initializes the MetaMask popup UI * - * @param {{ container: Element, connectionStream: * }} config Popup configuration object + * @param {{ container: Element, connectionStream: * }} config Popup configuration object * @param {Function} cb Called when initialization is complete */ function initializePopup ({ container, connectionStream }, cb) { |