m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix merge conflict

Browse Source
This commit is contained in:
Chi Kei Chan 2017-09-04 14:50:12 -07:00
parent b1fc290bed
commit 9213789c44
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/components/dropdowns/network-dropdown.js
View File

@ -147,13 +147,7 @@ NetworkDropdown.prototype.render = function () {
key: 'rinkeby', key: 'rinkeby',
closeMenu: () => this.props.hideNetworkDropdown(), closeMenu: () => this.props.hideNetworkDropdown(),
onClick: () => props.setProviderType('rinkeby'), onClick: () => props.setProviderType('rinkeby'),
<<<<<<< HEAD
style: {
fontSize: '18px',
},
=======
style: dropdownMenuItemStyle, style: dropdownMenuItemStyle,
>>>>>>> Fix menu style
}, },
[ [
providerType === 'rinkeby' ? h('.network-check', '✓') : h('.network-check__transparent', '✓'), providerType === 'rinkeby' ? h('.network-check', '✓') : h('.network-check__transparent', '✓'),