aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/app/components/dropdowns/network-dropdown.js6
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', '✓'),