aboutsummaryrefslogtreecommitdiffstats
path: root/development/uiStore.js
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-09-19 02:38:39 +0800
committerGitHub <noreply@github.com>2017-09-19 02:38:39 +0800
commita190bb60437e2edcdf7b9be39e69f2d34f2b0957 (patch)
tree64d0547165cbed1af2df5eec1d856c6c1847448d /development/uiStore.js
parent54bbf8d8590014b92e7857f30bdc2d8f3779431a (diff)
parent162a3827c7ba418ce8180d81c54ad09d9b9560b8 (diff)
downloadtangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.tar
tangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.tar.gz
tangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.tar.bz2
tangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.tar.lz
tangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.tar.xz
tangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.tar.zst
tangerine-wallet-browser-a190bb60437e2edcdf7b9be39e69f2d34f2b0957.zip
Merge pull request #2116 from chikeichan/nm
[NewUI] Fix merge conflict with latest master
Diffstat (limited to 'development/uiStore.js')
-rw-r--r--development/uiStore.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/development/uiStore.js b/development/uiStore.js
index 1299ee1dc..c71d66d3b 100644
--- a/development/uiStore.js
+++ b/development/uiStore.js
@@ -1,7 +1,7 @@
const createStore = require('redux').createStore
const applyMiddleware = require('redux').applyMiddleware
-const thunkMiddleware = require('redux-thunk')
-const createLogger = require('redux-logger')
+const thunkMiddleware = require('redux-thunk').default
+const createLogger = require('redux-logger').createLogger
const rootReducer = require('../ui/app/reducers')
module.exports = configureStore