diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2018-05-01 13:51:07 +0900 |
|---|---|---|
| committer | Shin'ya Ueoka <ueokande@i-beam.org> | 2018-05-01 13:51:07 +0900 |
| commit | 4d7c24f38a6861e1d498b6e7dd5c7be2d1a0ad15 (patch) | |
| tree | 0948f730a25eeda127c56a0f01009f14d066e4dc /src/background/index.js | |
| parent | 177940981ed9c4f096ad7db20f0b7ee044fd7b17 (diff) | |
| parent | fb8a0f36aa4d070df936cc7598ef8dd988ee1b15 (diff) | |
Merge remote-tracking branch 'origin/master' into background-adjacent-tabs
Diffstat (limited to 'src/background/index.js')
| -rw-r--r-- | src/background/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/background/index.js b/src/background/index.js index 8a68767..3ef712f 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,4 +1,4 @@ -import * as settingsActions from 'settings/actions/setting'; +import * as settingActions from 'background/actions/setting'; import messages from 'shared/messages'; import BackgroundComponent from 'background/components/background'; import reducers from 'background/reducers'; @@ -16,4 +16,4 @@ const store = createStore(reducers, (e, sender) => { // eslint-disable-next-line no-unused-vars const backgroundComponent = new BackgroundComponent(store); -store.dispatch(settingsActions.load()); +store.dispatch(settingActions.load()); |