psmattas/resolver
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Resolved Conlfict] Merge origin next to local.

Browse Source
This commit is contained in:
Qolzam
2018-04-04 10:37:03 +07:00
parent 9cd2672395 e23073534f
commit 74265a5ec1
14 changed files with 21 additions and 8418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/containers/setting/SettingComponent.tsx
View File

@@ -230,4 +230,4 @@ const mapStateToProps = (state: any, ownProps: ISettingComponentProps) => {
}
// - Connect component to redux store
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(SettingComponent as any) as any) as any)
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles as any)(SettingComponent as any) as any) as any)