diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-08 07:33:06 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-08 07:33:06 +0800 |
| commit | 86b7cc6637edefd2f628238a2abff540c82e1a78 (patch) | |
| tree | a6126d8b83ec7b66cd2a138c670863beedbefba1 /ui/app/conf-tx.js | |
| parent | 9a9c1f2cd48235be47e65b42c84bd9bf55ecbec4 (diff) | |
| parent | 44a45f38be5251eacd2c43ebbc55acf34f65084c (diff) | |
| download | tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.gz tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.bz2 tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.lz tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.xz tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.zst tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.zip | |
Resolve merge conflict.
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 8455826b8..db876dd9b 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -39,14 +39,14 @@ ConfirmTxScreen.prototype.render = function () { return ( - h('.unconftx-section.flex-column.flex-grow', [ + h('.flex-column.flex-grow', [ // subtitle and nav h('.section-title.flex-row.flex-center', [ h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { onClick: this.goHome.bind(this), }), - h('h2.page-subtitle', 'Confirmation'), + h('h2.page-subtitle', 'Confirm Transaction'), ]), h('h3', { |