diff options
| author | Thomas <tmashuang@gmail.com> | 2018-02-28 04:06:24 +0800 |
|---|---|---|
| committer | Thomas <tmashuang@gmail.com> | 2018-02-28 04:06:24 +0800 |
| commit | 7aa324bdf61e83f9ed64e6b0354d88e0af76f42b (patch) | |
| tree | d5f75c025bb527a1af4ed3468a9083f154ba0764 /ui | |
| parent | ac2e92fa5424bbb1517d7443a7c40dcac92af638 (diff) | |
| download | tangerine-wallet-browser-7aa324bdf61e83f9ed64e6b0354d88e0af76f42b.tar.gz tangerine-wallet-browser-7aa324bdf61e83f9ed64e6b0354d88e0af76f42b.tar.zst tangerine-wallet-browser-7aa324bdf61e83f9ed64e6b0354d88e0af76f42b.zip | |
Remove committed out merge code
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/components/dropdowns/components/account-dropdowns.js | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index f637ca19d..78b059d5b 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -134,22 +134,6 @@ class AccountDropdowns extends Component { ]), ]), -// ======= -// }, -// ), -// this.indicateIfLoose(keyring), -// h('span', { -// style: { -// marginLeft: '20px', -// fontSize: '24px', -// maxWidth: '145px', -// whiteSpace: 'nowrap', -// overflow: 'hidden', -// textOverflow: 'ellipsis', -// }, -// }, identity.name || ''), -// h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null), -// >>>>>>> master:ui/app/components/account-dropdowns.js ] ) }) |