diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-05 05:50:12 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-05 06:57:43 +0800 |
| commit | 9213789c44beaf4bf734bc6192dc646d706d5c44 (patch) | |
| tree | 4e7e9a6aa8b1dec5af46651a4fcf0d46e3925f3c | |
| parent | b1fc290bed26ae0ea8d182340854c82cc1f3d12d (diff) | |
| download | tangerine-wallet-browser-9213789c44beaf4bf734bc6192dc646d706d5c44.tar.gz tangerine-wallet-browser-9213789c44beaf4bf734bc6192dc646d706d5c44.tar.zst tangerine-wallet-browser-9213789c44beaf4bf734bc6192dc646d706d5c44.zip | |
Fix merge conflict
| -rw-r--r-- | ui/app/components/dropdowns/network-dropdown.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index 3f4ea6274..23af3f7e4 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -147,13 +147,7 @@ NetworkDropdown.prototype.render = function () { key: 'rinkeby', closeMenu: () => this.props.hideNetworkDropdown(), onClick: () => props.setProviderType('rinkeby'), -<<<<<<< HEAD - style: { - fontSize: '18px', - }, -======= style: dropdownMenuItemStyle, ->>>>>>> Fix menu style }, [ providerType === 'rinkeby' ? h('.network-check', '✓') : h('.network-check__transparent', '✓'), |