diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-02 02:04:25 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-03-02 02:04:25 +0800 |
| commit | e66035254f1778ec8e614cabecaf1a9493509888 (patch) | |
| tree | ab0ab43a9792075dfd2e1a23a95ea35a86d6d962 /app | |
| parent | 0a3849ec8477b4a61c50d715bd72b3e8f1ea8b66 (diff) | |
| parent | 6fb33853f2ceeb6ef48988a7ee9334dfc87a8223 (diff) | |
| download | tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.tar tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.tar.gz tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.tar.bz2 tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.tar.lz tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.tar.xz tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.tar.zst tangerine-wallet-browser-e66035254f1778ec8e614cabecaf1a9493509888.zip | |
More conflict resolution.
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/controllers/currency.js (renamed from app/scripts/lib/controllers/currency.js) | 0 | ||||
| -rw-r--r-- | app/scripts/controllers/preferences.js (renamed from app/scripts/lib/controllers/preferences.js) | 2 | ||||
| -rw-r--r-- | app/scripts/controllers/shapeshift.js (renamed from app/scripts/lib/controllers/shapeshift.js) | 0 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 6 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/lib/controllers/currency.js b/app/scripts/controllers/currency.js index c4904f8ac..c4904f8ac 100644 --- a/app/scripts/lib/controllers/currency.js +++ b/app/scripts/controllers/currency.js diff --git a/app/scripts/lib/controllers/preferences.js b/app/scripts/controllers/preferences.js index 7bd2e5631..8fd5fb8a0 100644 --- a/app/scripts/lib/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -1,5 +1,5 @@ const ObservableStore = require('obs-store') -const normalizeAddress = require('../sig-util').normalize +const normalizeAddress = require('eth-sig-util').normalize const extend = require('xtend') class PreferencesController { diff --git a/app/scripts/lib/controllers/shapeshift.js b/app/scripts/controllers/shapeshift.js index 3d955c01f..3d955c01f 100644 --- a/app/scripts/lib/controllers/shapeshift.js +++ b/app/scripts/controllers/shapeshift.js diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index cbef8924a..ab55ed697 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -11,10 +11,10 @@ const streamIntoProvider = require('web3-stream-provider/handler') const MetaMaskProvider = require('web3-provider-engine/zero.js') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex const KeyringController = require('./keyring-controller') -const PreferencesController = require('./lib/controllers/preferences') -const CurrencyController = require('./lib/controllers/currency') +const PreferencesController = require('./controllers/preferences') +const CurrencyController = require('./controllers/currency') const NoticeController = require('./notice-controller') -const ShapeShiftController = require('./lib/controllers/shapeshift') +const ShapeShiftController = require('./controllers/shapeshift') const MessageManager = require('./lib/message-manager') const PersonalMessageManager = require('./lib/personal-message-manager') const TxManager = require('./transaction-manager') |