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/css/index.css | |
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/css/index.css')
-rw-r--r-- | ui/app/css/index.css | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/app/css/index.css b/ui/app/css/index.css index de694f873..3f52b6ed4 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -411,10 +411,6 @@ input.large-input { } /* tx confirm */ -.unconftx-section { - margin: 0 20px; -} - .unconftx-section input[type=password] { height: 22px; padding: 2px; |