m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Correct merge conflict resolution errors.

Browse Source
This commit is contained in:
Dan 2018-03-06 22:26:13 -03:30
parent 7c2257e09c
commit 2420ad2477
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/accounts/import/private-key.js
View File

@ -38,8 +38,6 @@ PrivateKeyImportView.prototype.render = function () {
h('div.new-account-import-form__private-key-password-container', [ 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', { h('input.new-account-import-form__input-password', {
type: 'password', type: 'password',
id: 'private-key-box', id: 'private-key-box',

7
ui/app/components/account-menu/index.js
View File

@ -95,13 +95,6 @@ AccountMenu.prototype.render = function () {
icon: h('img', { src: 'images/mm-info-icon.svg' }), icon: h('img', { src: 'images/mm-info-icon.svg' }),
text: t('infoHelp'), 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, { h(Item, {
onClick: showConfigPage, onClick: showConfigPage,
icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }), icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),