diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-08-18 00:56:07 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-08-18 00:56:07 +0800 |
commit | 992e7f1b5aae5ae4a96c67dd40b6626f181b51c1 (patch) | |
tree | 11a429e8d3fdbe7b4945d77273598091c4cbd70d /app/scripts/controllers/balance.js | |
parent | 51e4a6d3355524cd8622d6d2893cc878a64dc53e (diff) | |
download | tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.gz tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.bz2 tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.lz tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.xz tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.zst tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.zip |
fix merge conflicts
Diffstat (limited to 'app/scripts/controllers/balance.js')
-rw-r--r-- | app/scripts/controllers/balance.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js index 4c97810a3..465751e61 100644 --- a/app/scripts/controllers/balance.js +++ b/app/scripts/controllers/balance.js @@ -80,7 +80,7 @@ class BalanceController { } }) this.accountTracker.store.subscribe(update) - this.blockTracker.on('block', update) + this.blockTracker.on('latest', update) } /** |