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/currency.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/currency.js')
| -rw-r--r-- | app/scripts/controllers/currency.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js index a93aff49b..d5bc5fe2b 100644 --- a/app/scripts/controllers/currency.js +++ b/app/scripts/controllers/currency.js @@ -1,4 +1,4 @@ - const ObservableStore = require('obs-store') +const ObservableStore = require('obs-store') const extend = require('xtend') const log = require('loglevel') |