equal
deleted
inserted
replaced
1 import { combineReducers } from 'redux-immutable'; |
1 //import { combineReducers } from 'redux-immutable'; |
|
2 import { combineReducers } from 'redux'; |
2 import { routerReducer } from 'react-router-redux'; |
3 import { routerReducer } from 'react-router-redux'; |
3 |
4 |
4 import notes from './notesReducer'; |
5 import notes from './notesReducer'; |
5 import { currentSession, sessions } from './sessionsReducer'; |
6 import { currentSession, sessions } from './sessionsReducer'; |
6 import { isAuthenticated, currentUser, login, token } from './authReducer'; |
7 import { isAuthenticated, currentUser, login, token } from './authReducer'; |
7 |
8 |
8 const rootReducer = combineReducers({ |
9 const rootReducer = combineReducers({ |
9 currentSession, |
10 // currentSession, |
10 sessions, |
11 sessions, |
11 notes, |
12 notes, |
12 isAuthenticated, |
13 isAuthenticated, |
13 currentUser, |
14 currentUser, |
14 login, |
15 login, |