diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
| commit | cf663f1104697440121d32cc6db2a8a1d5d54c5a (patch) | |
| tree | 3ed4b8b9fe8c85f3b3a5bf68482c3fb9967f2de5 /ui/app/store.js | |
| parent | 265725c6edd62a7f46a9b9cf5a443cf01f0ff00c (diff) | |
| parent | dc2ef967028723afe9fe1efd669754723e38a4f0 (diff) | |
| download | tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.gz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.bz2 tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.lz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.xz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.zst tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.zip | |
Fix conflict
Diffstat (limited to 'ui/app/store.js')
| -rw-r--r-- | ui/app/store.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/store.js b/ui/app/store.js index a738f1a12..ab6422e73 100644 --- a/ui/app/store.js +++ b/ui/app/store.js @@ -6,7 +6,6 @@ const rootReducer = require('./reducers') module.exports = configureStore - const loggerMiddleware = createLogger() const createStoreWithMiddleware = applyMiddleware( @@ -14,6 +13,6 @@ const createStoreWithMiddleware = applyMiddleware( loggerMiddleware )(createStore) -function configureStore(initialState) { +function configureStore (initialState) { return createStoreWithMiddleware(rootReducer, initialState) } |