summaryrefslogtreecommitdiff
path: root/frontend/src/reducers.js
diff options
context:
space:
mode:
authorJoffrey Bion <joffrey.bion@gmail.com>2017-05-28 21:32:36 +0200
committerGitHub <noreply@github.com>2017-05-28 21:32:36 +0200
commitba9cd259ed1ca2370565265eab9fe2628ad6502c (patch)
tree0c24821770274a414f80b3092d5be54902c042d9 /frontend/src/reducers.js
parentFix proxy not working since CRA upgrade (diff)
parentMove to immutable with Records (diff)
downloadseven-wonders-ba9cd259ed1ca2370565265eab9fe2628ad6502c.tar.gz
seven-wonders-ba9cd259ed1ca2370565265eab9fe2628ad6502c.tar.bz2
seven-wonders-ba9cd259ed1ca2370565265eab9fe2628ad6502c.zip
Merge pull request #14 from luxons/immutable
Move to immutable with Records
Diffstat (limited to 'frontend/src/reducers.js')
-rw-r--r--frontend/src/reducers.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/frontend/src/reducers.js b/frontend/src/reducers.js
index a7bba09a..4b98a9ca 100644
--- a/frontend/src/reducers.js
+++ b/frontend/src/reducers.js
@@ -1,4 +1,5 @@
-import { combineReducers, routerReducer } from 'redux-seamless-immutable';
+import { combineReducers } from 'redux-immutable';
+import { routerReducer } from 'react-router-redux';
import { reducer as toastrReducer } from 'react-redux-toastr';
import errorsReducer from './redux/errors';
bgstack15