diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-21 09:51:15 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-21 09:51:35 +0800 |
| commit | ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32 (patch) | |
| tree | d0e54e987f7ee42d21dd8a5aeb582c4a2c72e02c /ui/app/components/modals/index.scss | |
| parent | 6e813db47309b7773d430fecc6a467be66f6f16b (diff) | |
| parent | 887cad973f25f43d2d4502ff31657f156a44b188 (diff) | |
| download | tangerine-wallet-browser-ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32.tar.gz tangerine-wallet-browser-ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32.tar.zst tangerine-wallet-browser-ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/modals/index.scss')
| -rw-r--r-- | ui/app/components/modals/index.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/components/modals/index.scss b/ui/app/components/modals/index.scss index e198cca44..0acccf172 100644 --- a/ui/app/components/modals/index.scss +++ b/ui/app/components/modals/index.scss @@ -1,5 +1,7 @@ @import './customize-gas/index'; +@import './qr-scanner/index'; + .modal-container { width: 100%; height: 100%; |