diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-12-07 11:59:46 +0100 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-12-14 09:16:50 +0100 |
| commit | 276ab48216ec87b776cf85c69211c8d4970547fd (patch) | |
| tree | f2caeeb563cc5bd6da78ea62bb2bb164c29c1f72 | |
| parent | 7016f5124707cd94ca305978da1f7f0111e597be (diff) | |
| download | mullvadvpn-276ab48216ec87b776cf85c69211c8d4970547fd.tar.xz mullvadvpn-276ab48216ec87b776cf85c69211c8d4970547fd.zip | |
Rebase fixes
| -rw-r--r-- | .flowconfig | 1 | ||||
| -rw-r--r-- | app/containers/ConnectPage.js | 1 | ||||
| -rw-r--r-- | app/containers/SettingsPage.js | 1 | ||||
| -rw-r--r-- | app/lib/platform.js | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/.flowconfig b/.flowconfig index fe0a0ddaa5..813ae170fb 100644 --- a/.flowconfig +++ b/.flowconfig @@ -36,6 +36,7 @@ .*/node_modules/react-native/lib/.* .*/node_modules/react-native/jest/.* .*/node_modules/react-native/ReactAndroid/src/androidTest/.* +.*/node_modules/react-native-windows/.* [include] diff --git a/app/containers/ConnectPage.js b/app/containers/ConnectPage.js index 6db84a7680..3d698b371e 100644 --- a/app/containers/ConnectPage.js +++ b/app/containers/ConnectPage.js @@ -25,7 +25,6 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: SharedRouteProps) => const { backend } = props; return { -<<<<<<< HEAD onSettings: () => { pushHistory('/settings'); }, diff --git a/app/containers/SettingsPage.js b/app/containers/SettingsPage.js index 351c819b40..938d306fee 100644 --- a/app/containers/SettingsPage.js +++ b/app/containers/SettingsPage.js @@ -1,6 +1,7 @@ // @flow import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; import { push } from 'react-router-redux'; import Settings from '../components/Settings'; import { links } from '../config'; diff --git a/app/lib/platform.js b/app/lib/platform.js index 74ae69e145..66e5a099ba 100644 --- a/app/lib/platform.js +++ b/app/lib/platform.js @@ -7,7 +7,6 @@ const exit = () => { }; const open = (link: string) => { - // $FlowFixMe shell.openExternal(link); }; |