aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/account-menu/index.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-07 09:56:13 +0800
committerDan <danjm.com@gmail.com>2018-03-07 09:56:13 +0800
commit2420ad2477f7b688295a55c038b3473a4516dc52 (patch)
tree34c604946db0a53c3798d2b205665c8cc6e7905d /ui/app/components/account-menu/index.js
parent7c2257e09c2583a4ac24a78e1b3c58a750cb798f (diff)
downloadtangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar
tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.gz
tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.bz2
tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.lz
tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.xz
tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.tar.zst
tangerine-wallet-browser-2420ad2477f7b688295a55c038b3473a4516dc52.zip
Correct merge conflict resolution errors.
Diffstat (limited to 'ui/app/components/account-menu/index.js')
-rw-r--r--ui/app/components/account-menu/index.js7
1 files changed, 0 insertions, 7 deletions
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'),
}),