diff options
author | Joffrey Bion <joffrey.bion@gmail.com> | 2017-05-28 21:32:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-28 21:32:36 +0200 |
commit | ba9cd259ed1ca2370565265eab9fe2628ad6502c (patch) | |
tree | 0c24821770274a414f80b3092d5be54902c042d9 /frontend/src/reducers.js | |
parent | Fix proxy not working since CRA upgrade (diff) | |
parent | Move to immutable with Records (diff) | |
download | seven-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.js | 3 |
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'; |