diff options
| author |  vantezzen <properly@protonmail.com> | 2019-09-13 18:08:29 +0200 |
|---|---|---|
| committer | vantezzen <properly@protonmail.com> | 2019-09-13 18:08:29 +0200 |
| commit | f5d17ec2348a12fb4b494bf79d0c52065493bd75 (patch) | |
| tree | 2a8c6156dbd6f23c0f20cd0b1f9f0bcd6d1ee50f /src/features/todos | |
| parent | Merge Franz 5.3.2 (diff) | |
| download | ferdium-app-f5d17ec2348a12fb4b494bf79d0c52065493bd75.tar.gz ferdium-app-f5d17ec2348a12fb4b494bf79d0c52065493bd75.tar.zst ferdium-app-f5d17ec2348a12fb4b494bf79d0c52065493bd75.zip | |
Fix merge errors
Diffstat (limited to 'src/features/todos')
| -rw-r--r-- | src/features/todos/components/TodosWebview.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index d4271dba0..c252aff90 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js | |||
| @@ -7,6 +7,8 @@ import { Icon } from '@meetfranz/ui'; | |||
| 7 | import { defineMessages, intlShape } from 'react-intl'; | 7 | import { defineMessages, intlShape } from 'react-intl'; |
| 8 | 8 | ||
| 9 | import { mdiCheckAll } from '@mdi/js'; | 9 | import { mdiCheckAll } from '@mdi/js'; |
| 10 | import SettingsStore from '../../../stores/SettingsStore'; | ||
| 11 | |||
| 10 | import * as environment from '../../../environment'; | 12 | import * as environment from '../../../environment'; |
| 11 | import Appear from '../../../components/ui/effects/Appear'; | 13 | import Appear from '../../../components/ui/effects/Appear'; |
| 12 | import UpgradeButton from '../../../components/ui/UpgradeButton'; | 14 | import UpgradeButton from '../../../components/ui/UpgradeButton'; |