From f5d17ec2348a12fb4b494bf79d0c52065493bd75 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 13 Sep 2019 18:08:29 +0200 Subject: Fix merge errors --- src/features/todos/components/TodosWebview.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/features/todos') 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'; import { defineMessages, intlShape } from 'react-intl'; import { mdiCheckAll } from '@mdi/js'; +import SettingsStore from '../../../stores/SettingsStore'; + import * as environment from '../../../environment'; import Appear from '../../../components/ui/effects/Appear'; import UpgradeButton from '../../../components/ui/UpgradeButton'; -- cgit v1.2.3-54-g00ecf