diff options
| author | Dan <danjm.com@gmail.com> | 2018-03-07 09:56:13 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-03-07 09:56:13 +0800 |
| commit | 2420ad2477f7b688295a55c038b3473a4516dc52 (patch) | |
| tree | 34c604946db0a53c3798d2b205665c8cc6e7905d /ui/app | |
| parent | 7c2257e09c2583a4ac24a78e1b3c58a750cb798f (diff) | |
| download | tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.gz tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.zst tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.zip | |
Correct merge conflict resolution errors.
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/accounts/import/private-key.js | 2 | ||||
| -rw-r--r-- | ui/app/components/account-menu/index.js | 7 |
2 files changed, 0 insertions, 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 @@ -97,13 +97,6 @@ AccountMenu.prototype.render = function () { }), 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' }), text: t('settings'), }), |