diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
commit | 9b1df386de908ae14e0ce169f1231a0d6de77972 (patch) | |
tree | d7fc663343b7ba3c28dff0022ca018a01bea451c /ui/app/components/index.scss | |
parent | c0557b43e2c493de73c8bf74cfa9e5740c8cfd3f (diff) | |
parent | 5956f8d260270d41f1e5be53f3c058782a1ae7f4 (diff) | |
download | tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.gz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.bz2 tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.lz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.xz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.zst tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.zip |
fix merge conflicts
Diffstat (limited to 'ui/app/components/index.scss')
-rw-r--r-- | ui/app/components/index.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/components/index.scss b/ui/app/components/index.scss index e27b0f182..f901aed7d 100644 --- a/ui/app/components/index.scss +++ b/ui/app/components/index.scss @@ -40,6 +40,8 @@ @import './tabs/index'; +@import './token-balance/index'; + @import './transaction-activity-log/index'; @import './transaction-breakdown/index'; |