diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-11-27 11:14:01 +0100 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-12-14 09:16:50 +0100 |
| commit | 7dd023cb17746b217c8e5f1b78525bd5ec322be9 (patch) | |
| tree | 85ca726d8be704c86f56f4e22fd9e4d972e9a2db /app/lib | |
| parent | cc05ad18e7362cf5f8976a26ebf03105d1de0df4 (diff) | |
| download | mullvadvpn-7dd023cb17746b217c8e5f1b78525bd5ec322be9.tar.xz mullvadvpn-7dd023cb17746b217c8e5f1b78525bd5ec322be9.zip | |
Rebase fixes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/backend.js | 1 | ||||
| -rw-r--r-- | app/lib/platform.android.js | 4 | ||||
| -rw-r--r-- | app/lib/platform.js | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/lib/backend.js b/app/lib/backend.js index a68c2309e7..b76b3b3749 100644 --- a/app/lib/backend.js +++ b/app/lib/backend.js @@ -8,7 +8,6 @@ import accountActions from '../redux/account/actions'; import connectionActions from '../redux/connection/actions'; import settingsActions from '../redux/settings/actions'; import { push } from 'react-router-redux'; -import { defaultServer } from '../config'; import type { ReduxStore } from '../redux/store'; import type { AccountToken, BackendState, RelayLocation, RelaySettingsUpdate } from './ipc-facade'; diff --git a/app/lib/platform.android.js b/app/lib/platform.android.js index f1f286826b..d7bd39b867 100644 --- a/app/lib/platform.android.js +++ b/app/lib/platform.android.js @@ -6,8 +6,8 @@ const exit = () => { BackHandler.exitApp(); }; -const open = (link) => { +const open = (link: string) => { Linking.openURL(link); }; -export {exit, open};
\ No newline at end of file +export {exit, open}; diff --git a/app/lib/platform.js b/app/lib/platform.js index 868a24e588..74ae69e145 100644 --- a/app/lib/platform.js +++ b/app/lib/platform.js @@ -6,8 +6,9 @@ const exit = () => { remote.app.quit(); }; -const open = (link) => { +const open = (link: string) => { + // $FlowFixMe shell.openExternal(link); }; -export {exit, open};
\ No newline at end of file +export {exit, open}; |
