From 2420ad2477f7b688295a55c038b3473a4516dc52 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 6 Mar 2018 22:26:13 -0330
Subject: Correct merge conflict resolution errors.

---
 ui/app/accounts/import/private-key.js   | 2 --
 ui/app/components/account-menu/index.js | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js
index 0b49d3281..bc9e9384e 100644
--- a/ui/app/accounts/import/private-key.js
+++ b/ui/app/accounts/import/private-key.js
@@ -38,8 +38,6 @@ PrivateKeyImportView.prototype.render = function () {
 
       h('div.new-account-import-form__private-key-password-container', [
 
-        h('span.new-account-import-form__instruction', 'Paste your private key string here:'),
-
         h('input.new-account-import-form__input-password', {
           type: 'password',
           id: 'private-key-box',
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 043e3d8d1..e838e8916 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -95,13 +95,6 @@ AccountMenu.prototype.render = function () {
       icon: h('img', { src: 'images/mm-info-icon.svg' }),
       text: t('infoHelp'),
     }),
-    h(Item, {
-      onClick: showConfigPage,
-      icon: h('img', { src: 'images/settings.svg' }),
-      text: t('settings'),
-      icon: h('img.account-menu__item-icon', { src: 'images/mm-info-icon.svg' }),
-      text: t('infoHelp'),
-    }),
     h(Item, {
       onClick: showConfigPage,
       icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),
-- 
cgit