From 9213789c44beaf4bf734bc6192dc646d706d5c44 Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Mon, 4 Sep 2017 14:50:12 -0700
Subject: Fix merge conflict

---
 ui/app/components/dropdowns/network-dropdown.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'ui/app')

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', '✓'),
-- 
cgit